diff --git a/Makefile b/Makefile
index 93c1099..ab026c3 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ INCLUDES = \
 	-I$(ROOT_DIR)/platform/inc
 
 PYTHON_INCLUDES = \
-    -I/usr/include/python2.7
+    -I/usr/include/python3.5
 
 VPATH = \
 	$(API_DIR)/core/src \
diff --git a/python/VL53L0X.py b/python/VL53L0X.py
index 07c35ab..14382e5 100755
--- a/python/VL53L0X.py
+++ b/python/VL53L0X.py
@@ -38,11 +38,11 @@
 def i2c_read(address, reg, data_p, length):
     ret_val = 0;
     result = []
- 
+
     try:
         result = i2cbus.read_i2c_block_data(address, reg, length)
     except IOError:
-        ret_val = -1; 
+        ret_val = -1;
 
     if (ret_val == 0):
         for index in range(length):
@@ -57,10 +57,14 @@ def i2c_write(address, reg, data_p, length):
 
     for index in range(length):
         data.append(data_p[index])
-    try:
-        i2cbus.write_i2c_block_data(address, reg, data)
-    except IOError:
-        ret_val = -1; 
+
+    if data:
+        try:
+            i2cbus.write_i2c_block_data(address, reg, data)
+        except IOError:
+            ret_val = -1;
+        except OverflowError:
+            ret_val = -1
 
     return ret_val