diff --git a/Dockerrun.aws.json b/Dockerrun.aws.json
index 9276110..2adb9c3 100644
--- a/Dockerrun.aws.json
+++ b/Dockerrun.aws.json
@@ -1,3 +1,3 @@
 {
-  "AWSEBDockerrunVersion": 1,
+  "AWSEBDockerrunVersion": 1
 }
diff --git a/run.py b/run.py
index 406e2e7..ba9375e 100755
--- a/run.py
+++ b/run.py
@@ -7,8 +7,10 @@
 
 
 if __name__ == '__main__':
-    server = WSGIServer(('localhost', 5000), app)
     if '-s' not in sys.argv:
+        server = WSGIServer(('localhost', 5000), app)
         server.start()
         webbrowser.open('http://localhost:5000')
+    else:
+        server = WSGIServer(('0.0.0.0', 5000), app)
     server.serve_forever()  # just wait but not start the server *again*