diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c7d6c9..b758317 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,19 +2,19 @@
 	============================================
 
 	V2.0.6 - 25 July 2016
-	- Improved handling of watch app settings to make sure
-	they are loaded correctly without having to re-start app.
-	- Added watch app to Android phone app package so watch app can be
-	installed directly from phone rather than using pebble store.
+	- Added main activity menu option to view log files (via web browser).
+	- Added options to switch off spectrum display on watch to save battery.
 	- Changed main screen graph to bar chart and highlights frequency
 	region of interest.
 	- Fixed problem with log files not showing on web interface.
 	- Added system log file to help with de-bugging start-up/shutdown issues.
-	- Added main activity menu option to view log files (via web browser).
-	- Added options to switch off spectrum display on watch to save battery.
+	- Improved handling of watch app settings to make sure
+	they are loaded correctly without having to re-start app (but I'd still recommend re-starting the watch app manually to be sure :) )
 	- Reduced ammount of bluetooth comms to the watch to save battery.
 	- Added support for future watch app features (such as raw mode and digital
 	filter mode).
+	- Added watch app to Android phone app package so watch app can be
+	installed directly from phone rather than using pebble store - to make sure that watch app and Android app are always compatible.
 
 	V2.0.3 - 23 April 2016
 		Further modification to beep code to avoid occasional crashes
diff --git a/app/app-release-2.0.6.apk b/app/app-release-2.0.6.apk
new file mode 100644
index 0000000..7f56461
Binary files /dev/null and b/app/app-release-2.0.6.apk differ
diff --git a/app/build.gradle b/app/build.gradle
index f6727c9..43e1920 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,8 +1,9 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 24
+    buildToolsVersion "24.0.1"
+    useLibrary  'org.apache.http.legacy'
 
     defaultConfig {
         applicationId "uk.org.openseizuredetector"
diff --git a/app/src/main/assets/pebble_sd.pbw b/app/src/main/assets/pebble_sd.pbw
index f00cad9..b508c2f 100644
Binary files a/app/src/main/assets/pebble_sd.pbw and b/app/src/main/assets/pebble_sd.pbw differ
diff --git a/app/src/main/java/uk/org/openseizuredetector/SdDataSourcePebble.java b/app/src/main/java/uk/org/openseizuredetector/SdDataSourcePebble.java
index b563c92..557dd53 100644
--- a/app/src/main/java/uk/org/openseizuredetector/SdDataSourcePebble.java
+++ b/app/src/main/java/uk/org/openseizuredetector/SdDataSourcePebble.java
@@ -451,7 +451,7 @@ public class SdDataSourcePebble extends SdDataSource {
         PebbleKit.registerReceivedDataHandler(mContext, msgDataHandler);
         // We struggle to connect to pebble time if app is already running,
         // so stop app so we can re-connect to it.
-        stopWatchApp();
+        //stopWatchApp();
         startWatchApp();
     }
 
@@ -479,9 +479,16 @@ public class SdDataSourcePebble extends SdDataSource {
         mUtil.writeToSysLogFile("SdDataSourcePebble.startWatchApp() - closing app first");
         // first close the watch app if it is running.
         PebbleKit.closeAppOnPebble(mContext, SD_UUID);
-        Log.v(TAG, "startWatchApp() - starting watch app...");
-        mUtil.writeToSysLogFile("SdDataSourcePebble.startWatchApp() - starting watch app");
-        PebbleKit.startAppOnPebble(mContext, SD_UUID);
+        Log.v(TAG, "startWatchApp() - starting watch app after 5 seconds delay...");
+        Timer appStartTimer = new Timer();
+        appStartTimer.schedule(new TimerTask() {
+            @Override
+            public void run() {
+                Log.v(TAG, "startWatchApp() - starting watch app...");
+                mUtil.writeToSysLogFile("SdDataSourcePebble.startWatchApp() - starting watch app");
+                PebbleKit.startAppOnPebble(mContext, SD_UUID);
+            }
+        }, 5000);
     }
 
     /**