diff --git a/lib/server/index.js b/lib/server/index.js
index bea3133..5a22dd8 100644
--- a/lib/server/index.js
+++ b/lib/server/index.js
@@ -29,6 +29,7 @@ module.exports = function (options) {
 
 	var system = {
 		liveReload: options.liveReload,
+		liveReloadAttempts: 3,
 		liveReloadHost: os.hostname()
 	};
 	if(options.main) {
diff --git a/lib/server/websocket.js b/lib/server/websocket.js
index cfb80a7..812b915 100644
--- a/lib/server/websocket.js
+++ b/lib/server/websocket.js
@@ -1,31 +1 @@
-var WebSocketClient = require('websocket').client;
-
-var MyWebSocket = global.WebSocket = function(address){
-	this.address = address;
-
-	// Create the connection here
-	this.client = new WebSocketClient();
-
-	var ws = this;
-	this.client.on('connect', function(connection){
-		ws.connection = connection;
-
-		ws.connection.on("message", function(data){
-			var msg = data.utf8Data;
-			if(ws.onmessage) {
-				ws.onmessage({
-					data: msg
-				});
-			}
-		});
-
-		if(ws.onopen) {
-			ws.onopen();
-		}
-	});
-	this.client.connect(this.address);
-};
-
-MyWebSocket.prototype.send = function(msg){
-	this.connection.send(msg);
-};
+global.WebSocket = require("websocket").w3cwebsocket;