diff --git a/README.md b/README.md
index d6b40e3d..9720507d 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ npm install
 npm start
 ```
 
-Then open http://0.0.0.0:3000 in a web browser.
+Then open http://0.0.0.0:3000 in a web browser (use http://127.0.0.1:3000 is running under Windows).
 
 ## Addons
 
diff --git a/bin/server b/bin/server
deleted file mode 100755
index 91f32dba..00000000
--- a/bin/server
+++ /dev/null
@@ -1,4 +0,0 @@
-#! /usr/bin/env sh
-
-# Development server for xterm.js
-node demo/app.js
diff --git a/bin/test b/bin/test
deleted file mode 100755
index d7d2ed24..00000000
--- a/bin/test
+++ /dev/null
@@ -1,5 +0,0 @@
-#! /bin/bash
-#
-# Testing script for xterm.js
-
-node_modules/.bin/mocha $@
diff --git a/demo/app.js b/demo/app.js
index c48f6091..8661cc62 100644
--- a/demo/app.js
+++ b/demo/app.js
@@ -1,6 +1,7 @@
 var express = require('express');
 var app = express();
 var expressWs = require('express-ws')(app);
+var os = require('os');
 var pty = require('pty.js');
 
 app.use('/src', express.static(__dirname + '/../src'));
@@ -22,7 +23,7 @@ app.ws('/bash', function(ws, req) {
   /**
    * Open bash terminal and attach it
    */
-  var term = pty.spawn('bash', [], {
+  var term = pty.spawn(process.platform === 'win32' ? 'cmd.exe' : 'bash', [], {
     name: 'xterm-color',
     cols: 80,
     rows: 24,
@@ -46,7 +47,7 @@ app.ws('/bash', function(ws, req) {
 });
 
 var port = process.env.PORT || 3000,
-    host = '0.0.0.0';
+    host = os.platform() === 'win32' ? '127.0.0.1' : '0.0.0.0';
 
 console.log('App listening to http://' + host + ':' + port);
 app.listen(port, host);
diff --git a/package.json b/package.json
index 1b98517c..055ef340 100644
--- a/package.json
+++ b/package.json
@@ -15,8 +15,8 @@
     "docdash": "0.4.0"
   },
   "scripts": {
-    "start": "bash bin/server",
-    "test": "bash bin/test --recursive",
+    "start": "node demo/app",
+    "test": "mocha --recursive",
     "build:docs": "node_modules/.bin/jsdoc -c jsdoc.json"
   }
 }