diff --git a/package.json b/package.json
index 88027429..eeb1304c 100644
--- a/package.json
+++ b/package.json
@@ -67,6 +67,7 @@
     "git-dirty": "~1.0.2",
     "glob": "~7.1.1",
     "immutability-helper": "~2.0.0",
+    "internal-ip": "~1.2.0",
     "karma": "~1.3.0",
     "karma-cli": "~1.0.0",
     "karma-mocha": "~1.2.0",
diff --git a/server.js b/server.js
index e52c1bbc..19af0fa5 100644
--- a/server.js
+++ b/server.js
@@ -1,6 +1,7 @@
 const path = require('path');
 const express = require('express');
 const webpack = require('webpack');
+const internalIp = require('internal-ip');
 const config = require('./webpack.config.development');
 
 const app = express();
@@ -20,11 +21,17 @@ app.get('*', function (req, res) {
   res.sendFile(path.join(__dirname, './spec/index.html'));
 });
 
-app.listen(8080, '0.0.0.0', function (err) {
+const port = 8080;
+const ip = internalIp.v4();
+
+app.listen(port, (err) => {
   if (err) {
     console.log(err);
     return;
   }
 
-  console.log('Listening at http://0.0.0.0:8080');
+  console.log(' --------------------------------------');
+  console.log(`    Local: http://0.0.0.0:${port}`);
+  console.log(` External: http://${ip}:${port}`);
+  console.log(' --------------------------------------');
 });