diff --git a/bin/peerjs b/bin/peerjs
index 4d31846..27ea169 100755
--- a/bin/peerjs
+++ b/bin/peerjs
@@ -4,7 +4,8 @@ var path = require('path')
     , pkg = require('../package.json')
     , fs = require('fs')
     , version = pkg.version
-    , PeerServer = require('../lib')()
+    , app = require('express')()
+    , PeerServer = require('../lib')
     , opts = require('optimist')
         .usage('Usage: $0')
         .options({
@@ -75,8 +76,10 @@ process.on('uncaughtException', function(e) {
     console.error('Error: ' + e);
 });
 
-var server = new PeerServer(opts);
-server.listen(opts.port);
+opts.server = app.listen(opts.port);
+
+app.use(PeerServer(opts));
+
 console.log(
     'Started PeerServer, port: ' + opts.port + ', path: ' + (opts.path || '/') + (" (v. %s)"), version
 );
diff --git a/lib/index.js b/lib/index.js
index 66a33fc..6ee38ea 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -4,12 +4,7 @@ var proto = require('./server');
 var util = require('./util');
 var http = require('http');
 
-exports = module.exports = {
-    PeerServer: createPeerServer
-};
-
 function createPeerServer(options, callback) {
-
     var app = express();
 
     mixin(app, proto);
@@ -62,16 +57,13 @@ function createPeerServer(options, callback) {
 
     app._server = options.server;
 
-    if (app.options.port) {
-        app._server = http.createServer(app);
-        app._server.listen(options.port, options.host, callback);
-    }
-
     if (!app._server) {
-        throw new Error('Neither port or server is passed to constructor - can\'t start PeerServer');
+        throw new Error('Server is not passed to constructor - can\'t start PeerServer');
     }
 
     app._initializeWSS();
 
     return app;
 }
+
+exports = module.exports = createPeerServer;