diff --git a/MQTTSNGateway/README.md b/MQTTSNGateway/README.md
index d801c7c..77067ab 100644
--- a/MQTTSNGateway/README.md
+++ b/MQTTSNGateway/README.md
@@ -2,7 +2,7 @@
 
 ### **step1. Build the gateway**   
 ````
-$ git clone -b gateway https://github.com/eclipse/paho.mqtt-sn.embedded-c 
+$ git clone https://github.com/eclipse/paho.mqtt-sn.embedded-c   
 $ cd paho.mqtt-sn.embedded-c/MQTTSNGateway       
 $ make   
 $ make install   
diff --git a/MQTTSNGateway/src/linux/xbee/SensorNetwork.cpp b/MQTTSNGateway/src/linux/xbee/SensorNetwork.cpp
index d927fc2..1a806a7 100644
--- a/MQTTSNGateway/src/linux/xbee/SensorNetwork.cpp
+++ b/MQTTSNGateway/src/linux/xbee/SensorNetwork.cpp
@@ -120,7 +120,7 @@ int SensorNetwork::read(uint8_t* buf, uint16_t bufLen)
 int SensorNetwork::initialize(void)
 {
 	char param[MQTTSNGW_PARAM_MAX];
-	uint16_t baudrate = 9600;
+	uint32_t baudrate = 9600;
 	uint8_t apimode = 2;
 
 	if (theProcess->getParam("ApiMode", param) == 0)
@@ -134,7 +134,7 @@ int SensorNetwork::initialize(void)
 
 	if (theProcess->getParam("Baudrate", param) == 0)
 	{
-		baudrate = (uint16_t)atoi(param);
+		baudrate = (uint32_t)atoi(param);
 	}
 	_description += ", Baudrate ";
 	sprintf(param ,"%d", baudrate);