diff --git a/MQTTSNGateway/src/MQTTSNGateway.h b/MQTTSNGateway/src/MQTTSNGateway.h
index 48f237a..3f6af96 100644
--- a/MQTTSNGateway/src/MQTTSNGateway.h
+++ b/MQTTSNGateway/src/MQTTSNGateway.h
@@ -25,7 +25,7 @@ namespace MQTTSNGW
 /*=================================
  *    Starting prompt
  ==================================*/
-#define GATEWAY_VERSION " * Version: 0.9.6"
+#define GATEWAY_VERSION " * Version: 0.9.7"
 
 #define PAHO_COPYRIGHT0 " * MQTT-SN Transparent Gateway"
 #define PAHO_COPYRIGHT1 " * Part of Project Paho in Eclipse"
diff --git a/MQTTSNGateway/src/linux/xbee/SensorNetwork.h b/MQTTSNGateway/src/linux/xbee/SensorNetwork.h
index 202f08b..24b8752 100644
--- a/MQTTSNGateway/src/linux/xbee/SensorNetwork.h
+++ b/MQTTSNGateway/src/linux/xbee/SensorNetwork.h
@@ -40,9 +40,10 @@ namespace MQTTSNGW
 
 #define XMIT_STATUS_TIME_OVER    5000
 
-#define ESCAPE     0x7d
-#define XON        0x11
-#define XOFF       0x13
+#define START_BYTE               0x7e
+#define ESCAPE                   0x7d
+#define XON                      0x11
+#define XOFF                     0x13
 
 /*===========================================
   Class  SerialPort