diff --git a/src/c_buffer.c b/src/c_buffer.c
index d014682..9991268 100644
--- a/src/c_buffer.c
+++ b/src/c_buffer.c
@@ -34,6 +34,10 @@
 #define LOG(f_, ...) printf((f_), ##__VA_ARGS__)
 #endif
 
+#ifndef LOG_DEBUG
+#define LOG_DEBUG(f_, ...)// printf((f_), ##__VA_ARGS__)
+#endif
+
 static inline size_t MODULO_DEC(size_t value, size_t decrement, size_t modulus)
 {
     return (value + modulus - (decrement % modulus)) % modulus;
@@ -381,7 +385,7 @@ uint8_t cBufferReadByte(cBuffer_t *inst) {
 
     // Protect from empty buffers
     if (cBufferEmpty(inst)) {
-        LOG("Reading from empty buffer!\n");
+        LOG_DEBUG("Reading from empty buffer!\n");
         return 0;
     }
 
diff --git a/src/c_buffer.h b/src/c_buffer.h
index ebba8fd..a496318 100644
--- a/src/c_buffer.h
+++ b/src/c_buffer.h
@@ -26,8 +26,13 @@
  * SOFTWARE.
 */
 
+
 #ifndef C_BUFFER_H
 #define C_BUFFER_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 
 #include <stdint.h>
 #include <stddef.h>
@@ -222,4 +227,7 @@ int32_t cBufferEmptyWrite(cBuffer_t* inst, size_t num_bytes);
  */
 int32_t cBufferEmptyRead(cBuffer_t* inst, size_t num_bytes);
 
+#ifdef __cplusplus
+}
+#endif
 #endif /* C_BUFFER_H */
\ No newline at end of file