diff --git a/release/scenarium-oauth.jar b/release/scenarium-oauth.jar
index 69a3181..5d51b28 100644
Binary files a/release/scenarium-oauth.jar and b/release/scenarium-oauth.jar differ
diff --git a/src/io/scenarium/oauth/WebLauncher.java b/src/io/scenarium/oauth/WebLauncher.java
index 8b85e4c..1eecc92 100755
--- a/src/io/scenarium/oauth/WebLauncher.java
+++ b/src/io/scenarium/oauth/WebLauncher.java
@@ -70,17 +70,23 @@ public class WebLauncher {
 		entry.disconnect();
 		entry = null;
 		*/
+		HttpServer server = GrizzlyHttpServerFactory.createHttpServer(getBaseURI(), rc);
+		Runtime.getRuntime().addShutdownHook(new Thread(new Runnable() {
+			@Override
+			public void run() {
+				System.out.println("Stopping server..");
+				server.stop();
+			}
+		}, "shutdownHook"));
+
+		// run
 		try {
-			HttpServer server = GrizzlyHttpServerFactory.createHttpServer(getBaseURI(), rc);
 			server.start();
-
-			System.out.println(String.format(
-					"Jersey app started at " + "%s\nHit enter to stop it...",
-					getBaseURI(), getBaseURI()));
-
-			System.in.read();
-			server.shutdownNow();
+			System.out.println("Jersey app started at " + getBaseURI());
+			System.out.println("Press CTRL^C to exit..");
+			Thread.currentThread().join();
 		} catch (Exception e) {
+			System.out.println("There was an error while starting Grizzly HTTP server.");
 			e.printStackTrace();
 		}
 	}