diff --git a/bin/SSLDroid.apk b/bin/SSLDroid.apk
index c691a50..be019bc 100644
Binary files a/bin/SSLDroid.apk and b/bin/SSLDroid.apk differ
diff --git a/bin/classes.dex b/bin/classes.dex
index 09d31d0..f995ea7 100644
Binary files a/bin/classes.dex and b/bin/classes.dex differ
diff --git a/src/hu/blint/ssldroid/SSLDroid.java b/src/hu/blint/ssldroid/SSLDroid.java
index 8c92d81..30bccec 100644
--- a/src/hu/blint/ssldroid/SSLDroid.java
+++ b/src/hu/blint/ssldroid/SSLDroid.java
@@ -58,7 +58,7 @@ public class SSLDroid extends Service {
     	keyPass = settingPkcspass;
 		
 		//Toast.makeText(this, "SSLDroid Service Started", Toast.LENGTH_LONG).show();
-		createNotification(0, "SSLDroid is running", "SSLDroid service is running");
+		createNotification(0, true, "SSLDroid is running", "SSLDroid service is running");
 		Log.d(TAG, "SSLDroid Service Started");
 
 		//createNotification("test", "This is a test of the emergency broadcast system");
@@ -97,12 +97,13 @@ public class SSLDroid extends Service {
 		notificationManager.cancel(id);
 	}
 	
-	public void createNotification(int id, String title, String text) {
+	public void createNotification(int id, boolean persistent, String title, String text) {
 		NotificationManager notificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE);
 		Notification notification = new Notification(R.drawable.icon,
 				"SSLDroid startup", System.currentTimeMillis());
 		// Hide the notification after its selected
-		//notification.flags |= Notification.FLAG_AUTO_CANCEL;
+		if (persistent == true)
+			notification.flags |= Notification.FLAG_NO_CLEAR;
 
 		Intent intent = new Intent(this, SSLDroidGui.class);
 		PendingIntent activity = PendingIntent.getActivity(this, 0, intent, 0);
diff --git a/src/hu/blint/ssldroid/TcpProxy.java b/src/hu/blint/ssldroid/TcpProxy.java
index cf39df1..a928be4 100644
--- a/src/hu/blint/ssldroid/TcpProxy.java
+++ b/src/hu/blint/ssldroid/TcpProxy.java
@@ -48,6 +48,11 @@ public class TcpProxy {
 		}
 		server = new TcpProxyServerThread(ss, listenPort, tunnelHost, tunnelPort, keyFile, keyPass);
 		server.start();
+		/* try {
+			server.wait();
+		} catch (InterruptedException e) {
+			Log.d("SSLDroid", "Server thread interrupted: " + e.toString());
+		} */
 	}
 
 	public void stop() {