diff --git a/.gitignore b/.gitignore
index d497d0f..e0543c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,8 +10,10 @@
 /Release/
 /Debug/
 /core
-Build
+Build/
 *.a
 CMakeFiles/
 *.cmake
 CMakeCache.txt
+bin/
+/build.gateway/
\ No newline at end of file
diff --git a/MQTTSNGateway/README.md b/MQTTSNGateway/README.md
index 138f6ea..e592b4c 100644
--- a/MQTTSNGateway/README.md
+++ b/MQTTSNGateway/README.md
@@ -5,9 +5,9 @@ This Gateway can run as a transparent or aggregating Gateway by specifying the g
 
 ### **step1. Build the gateway**   
 ````
-$ git clone -b develop https://github.com/eclipse/paho.mqtt-sn.embedded-c         
-$ cmake .. [-DSENSORNET={udp|udp6|xbee|loralink}] 
-$ make   
+$ git clone -b develop https://github.com/eclipse/paho.mqtt-sn.embedded-c  
+$ cd paho.mqtt-sn.embedded-c/MQTTSNGateway      
+$ ./build.sh {udp|udp6|xbee|loralink}]  
     
 ````      
 By default, a gateway for UDP is built.    
@@ -19,7 +19,7 @@ MQTT-SNGateway and MQTT-SNLogmonitor (executable programs) are built in the Buil
 
 ````    
  
-$ ./Build/MQTT-SNGateway -f ./MQTTSNGateway/gateway.conf    
+$ ./bin/MQTT-SNGateway -f gateway.conf    
 ````   
 If you get the error message as follows:
 ````    
@@ -28,7 +28,7 @@ Aborted (core dumped)
 ````
 You have to start using sudo command only once for the first time.    
 ````
-$ sudo ./Build/MQTT-SNGateway -f ./MQTTSNGateway/gateway.conf    
+$ sudo ./bin/MQTT-SNGateway -f gateway.conf    
 ````
 
 ### **How to Change the configuration of the gateway**    
@@ -119,7 +119,7 @@ Restart the gateway with sudo only once to create shared memories.
 
 open ssh terminal and execute LogMonitor.
 
-`$ ./MQTT-SNLogmonitor`    
+`$ ./bin/MQTT-SNLogmonitor`    
 
 Now you can get the Log on your terminal.
 
diff --git a/MQTTSNGateway/build.sh b/MQTTSNGateway/build.sh
new file mode 100755
index 0000000..2895de5
--- /dev/null
+++ b/MQTTSNGateway/build.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+if [ $# -eq 0 ]; then
+    echo "Usage: build.sh { udp | udp6 | xbee | loralink }"
+else
+    echo "Start building MQTT-SN Gateway"
+    
+    SCRIPT_DIR=$(cd $(dirname $0); pwd)
+    cd $SCRIPT_DIR/..
+    rm -rf build.gateway
+    mkdir build.gateway
+    cd build.gateway
+    cmake .. -DSENSORNET=$1
+    make MQTTSNPacke
+    make MQTT-SNGateway
+    make MQTT-SNLogmonitor
+fi
\ No newline at end of file
diff --git a/MQTTSNGateway/src/CMakeLists.txt b/MQTTSNGateway/src/CMakeLists.txt
index 788d661..b0540c7 100644
--- a/MQTTSNGateway/src/CMakeLists.txt
+++ b/MQTTSNGateway/src/CMakeLists.txt
@@ -11,19 +11,20 @@
 #    http://www.eclipse.org/org/documents/edl-v10.php.
 #
 #  Contributors:
-#     a1lu - initial version
+#     a1lu  - initial version
+#     ty4tw - modify
 #*******************************************************************************/
 PROJECT(mqtt-sn-gateway CXX)
 
-set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Build)
-set(CMAKE_CXX_STANDARD 11)
+SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/../bin)
+SET(CMAKE_CXX_STANDARD 11)
 
 SET(OS linux)
 
-if(NOT DEFINED SENSORNET)
-    set(SENSORNET udp)
-endif()
-message(STATUS "SENSORNET: " ${SENSORNET})
+IF(NOT DEFINED SENSORNET)
+    SET(SENSORNET udp)
+ENDIF()
+MESSAGE(STATUS "SENSORNET: " ${SENSORNET})
 
 ADD_LIBRARY(mqtt-sngateway_common
        MQTTGWConnectionHandler.cpp
diff --git a/MQTTSNPacket/samples/CMakeLists.txt b/MQTTSNPacket/samples/CMakeLists.txt
index 7be7351..c7fc47b 100644
--- a/MQTTSNPacket/samples/CMakeLists.txt
+++ b/MQTTSNPacket/samples/CMakeLists.txt
@@ -16,8 +16,6 @@
 
 PROJECT(mqtt-sn-samples)
 
-set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Build)
-
 INCLUDE_DIRECTORIES(../src)
 
 ADD_EXECUTABLE(
diff --git a/MQTTSNPacket/test/CMakeLists.txt b/MQTTSNPacket/test/CMakeLists.txt
index f586b11..4d563b3 100644
--- a/MQTTSNPacket/test/CMakeLists.txt
+++ b/MQTTSNPacket/test/CMakeLists.txt
@@ -16,8 +16,6 @@
 
 PROJECT(mqtt-sn-tests)
 
-set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/Build)
-
 INCLUDE_DIRECTORIES(../src)
 
 ADD_EXECUTABLE(
diff --git a/travis-build.sh b/travis-build.sh
index 6e4bc02..d8907ff 100755
--- a/travis-build.sh
+++ b/travis-build.sh
@@ -6,15 +6,17 @@ rm -rf build.paho
 mkdir build.paho
 cd build.paho
 echo "travis build dir $TRAVIS_BUILD_DIR pwd $PWD"
-cmake ..
+cmake .. -DSENSORNET=loralink
 make
 ctest -VV --timeout 600
 cmake .. -DSENSORNET=xbee
 make MQTT-SNGateway
 cmake .. -DSENSORNET=udp6
 make MQTT-SNGateway
-cmake .. -DSENSORNET=loralink
+cmake .. -DSENSORNET=udp
 make MQTT-SNGateway
 cd ../MQTTSNGateway/GatewayTester
 make
 
+
+