diff --git a/README.md b/README.md
index 2734851b67..eb89c25e83 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ npm install
 # start the server
 npm start
 ```
-go to [http://0.0.0.0:3000](http://0.0.0.0:3000) in your browser
+go to [http://0.0.0.0:3000](http://0.0.0.0:3000) or [http://localhost:3000](http://localhost:3000) in your browser
 
 # Table of Contents
 * [File Structure](#file-structure)
diff --git a/package.json b/package.json
index 985662c3b5..7a17a36169 100644
--- a/package.json
+++ b/package.json
@@ -35,8 +35,8 @@
   },
   "dependencies": {
     "angular2": "2.0.0-beta.0",
-    "es6-shim": "^0.33.3",
     "es6-promise": "^3.0.2",
+    "es6-shim": "^0.33.3",
     "es7-reflect-metadata": "^1.4.0",
     "rxjs": "5.0.0-beta.0",
     "zone.js": "0.5.10"
diff --git a/webpack.config.js b/webpack.config.js
index b60cd44f7c..d156d19dab 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -15,7 +15,7 @@ var ENV = process.env.ENV = process.env.NODE_ENV = 'development';
 var metadata = {
   title: 'Angular2 Webpack Starter by @gdi2990 from @AngularClass',
   baseUrl: '/',
-  host: '0.0.0.0',
+  host: 'localhost',
   port: 3000,
   ENV: ENV
 };
diff --git a/webpack.prod.config.js b/webpack.prod.config.js
index 09f5321b69..eab55afa15 100644
--- a/webpack.prod.config.js
+++ b/webpack.prod.config.js
@@ -16,7 +16,7 @@ var CopyWebpackPlugin = require('copy-webpack-plugin');
 var HtmlWebpackPlugin = require('html-webpack-plugin');
 var WebpackMd5Hash    = require('webpack-md5-hash');
 var ENV = process.env.NODE_ENV = process.env.ENV = 'production';
-var HOST = process.env.HOST || '0.0.0.0';
+var HOST = process.env.HOST || 'localhost';
 var PORT = process.env.PORT || 8080;
 
 var metadata = {