diff --git a/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/agent/README.md b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/agent/README.md
index f7956c23d5..1500c82751 100644
--- a/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/agent/README.md
+++ b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/agent/README.md
@@ -25,6 +25,9 @@ during boot up process.
 
 create a service:
         ` sudo ./startService.sh `
+        
+get current state of the service:
+       ` sudo service RaspberryService.sh status `
 
 start service:
        ` sudo service RaspberryService.sh start `
@@ -35,8 +38,7 @@ stop service:
 restart service:
        ` sudo service RaspberryService.sh restart `
 
-get current state of the service:
-       ` sudo service RaspberryService.sh status `
+
 
 
       
diff --git a/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/agent/RaspberryService.sh b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/agent/RaspberryService.sh
index c4588c9905..e32907e541 100644
--- a/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/agent/RaspberryService.sh
+++ b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/agent/RaspberryService.sh
@@ -46,7 +46,6 @@ PIDFILE=/var/run/$DAEMON_NAME.pid
 DAEMON_OPTS="-l /usr/local/src/RaspberryAgent/RaspberryStats.log -m N -i 60"
 
 # This next line determines what user the script runs as.
-# Root generally not recommended but necessary if you are using the Raspberry Pi GPIO from Python.
 DAEMON_USER=root   #pi
 
 # Load the VERBOSE setting and other rcS variables
diff --git a/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/agent/src/RaspberryAgent.py b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/agent/src/RaspberryAgent.py
index 793aa42d8b..956d1fb0cf 100644
--- a/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/agent/src/RaspberryAgent.py
+++ b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/agent/src/RaspberryAgent.py
@@ -54,8 +54,8 @@ LOG_LEVEL = logging.INFO  # Could be e.g. "DEBUG" or "WARNING"
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #       Python version
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-if sys.version_info<(2,7,5):
-  sys.stderr.write("You need python 2.7.5 or later to run this script\n")
+if sys.version_info<(2,7,0):
+  sys.stderr.write("You need python 2.7.0 or later to run this script\n")
   exit(1)
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/agent/src/iotUtils.py b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/agent/src/iotUtils.py
index fa05965b13..1419f91d65 100644
--- a/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/agent/src/iotUtils.py
+++ b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/agent/src/iotUtils.py
@@ -31,6 +31,7 @@ import running_mode
 global HOST_NAME
 HOST_NAME = "0.0.0.0"
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+HTTP_SERVER_PORT = 5678 # http server port which is listning on
 
 global LAST_TEMP
 LAST_TEMP = 25  # The Last read temperature value from the DHT sensor. Kept globally
@@ -40,9 +41,7 @@ TEMPERATURE_READING_INTERVAL_REAL_MODE = 3
 TEMPERATURE_READING_INTERVAL_VIRTUAL_MODE = 60
 TEMP_PIN = 4
 TEMP_SENSOR_TYPE = 11
-
 BULB_PIN = 11  # The GPIO Pin# in RPi to which the LED is connected
-HTTP_SERVER_PORT = 5678 # http server port which is listning on
 global GPIO
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/agent/startService.sh b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/agent/startService.sh
index 2d1b08b286..e073b10924 100644
--- a/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/agent/startService.sh
+++ b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/agent/startService.sh
@@ -20,6 +20,13 @@
 
 #!/usr/bin/env bash
 
+echo "----------------------------------------------------------------"
+echo "|		          WSO2 IOT Sample				                  "
+echo "|		            RaspiAgent				                      "
+echo "|	              ----------------				                  "
+echo "|           ....initializing service-start-script	              "
+echo "----------------------------------------------------------------"
+
 destination="/usr/local/src/RaspberryAgent"
 currentDir=$PWD
 if [ ! -d "$destination" ]
diff --git a/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/agent/testAgent.sh b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/agent/testAgent.sh
index 8ea2a99cb0..b9d24532bf 100644
--- a/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/agent/testAgent.sh
+++ b/features/device-mgt-iot-raspberrypi-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.feature/src/main/resources/agent/testAgent.sh
@@ -21,10 +21,10 @@
 #!/bin/bash
 
 echo "----------------------------------------------------------------"
-echo "|		WSO2 IOT Sample				"
-echo "|		  RaspiAgent				"
-echo "|	       ----------------				"
-echo "|    ....initializing startup-script	"
+echo "|		                 WSO2 IOT Sample				          "
+echo "|		                   RaspiAgent				              "
+echo "|	                     ----------------				          "
+echo "|                ....initializing startup-script	              "
 echo "----------------------------------------------------------------"
 
 currentDir=$PWD