diff --git a/server/client b/server/client
deleted file mode 120000
index 684d7ec..0000000
--- a/server/client
+++ /dev/null
@@ -1 +0,0 @@
-../client/
\ No newline at end of file
diff --git a/server/server.py b/server/server.py
old mode 100644
new mode 100755
index d58f44a..4723019
--- a/server/server.py
+++ b/server/server.py
@@ -1,11 +1,15 @@
-from SimpleWebSocketServer import SimpleWebSocketServer, WebSocket
+#!/usr/bin/python
 
+from SimpleWebSocketServer import SimpleWebSocketServer, WebSocket
 import json
 import socket
 import os
 import threading
 import select
 import random
+import SimpleHTTPServer
+import SocketServer
+
 
 SOCKPATH='/home/dario/.mpv.sock'
 global mpvParser
@@ -69,6 +73,7 @@ class MpvSockParser(object):
         self.poller.sendData('{"command":["get_property","pause"],"request_id":10}')
         self.poller.sendData('{"command":["get_property","mute"],"request_id":11}')
         
+        self.poller.daemon = True
         self.poller.start()
 
     def newData(self, data):
@@ -153,10 +158,20 @@ class WSHandler(WebSocket):
         self.sendMessage(unicode( json.dumps(data) ))
         
 
+
 if __name__=='__main__':
     global mpvParser
     mpvParser = MpvSockParser()
     mpvParser.startPoll()
     
-    server = SimpleWebSocketServer('', 8000, WSHandler)
-    server.serveforever()
+    os.chdir('../client/')
+    SocketServer.TCPServer.allow_reuse_address = True
+    httpd = SocketServer.TCPServer(("", 8001), SimpleHTTPServer.SimpleHTTPRequestHandler)
+
+    wsd = SimpleWebSocketServer('', 8000, WSHandler)
+    
+    wsThread = threading.Thread(target=wsd.serveforever)
+    wsThread.daemon=True
+    wsThread.start()
+
+    httpd.serve_forever()