diff --git a/package.json b/package.json
index e6eb571..3e40148 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,7 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
+    "node-static": "^0.7.10",
     "ws": "^3.3.2"
   },
   "devDependencies": {
diff --git a/server/server.js b/server/server.js
index 0a72d1b..ef10dae 100644
--- a/server/server.js
+++ b/server/server.js
@@ -1,7 +1,9 @@
 const HTTPS_PORT = 8443;
 
+
 const fs = require('fs');
 const https = require('https');
+const static = require('node-static');
 const WebSocket = require('ws');
 const WebSocketServer = WebSocket.Server;
 
@@ -11,20 +13,15 @@ const serverConfig = {
     cert: fs.readFileSync('cert.pem'),
 };
 
+const file = new static.Server('./client');
+
 // ----------------------------------------------------------------------------------------
 
 // Create a server for the client html page
 var handleRequest = function(request, response) {
-    // Render the single client html file for any request the HTTP server receives
-    console.log('request received: ' + request.url);
-
-    if(request.url === '/') {
-        response.writeHead(200, {'Content-Type': 'text/html'});
-        response.end(fs.readFileSync('client/index.html'));
-    } else if(request.url === '/webrtc.js') {
-        response.writeHead(200, {'Content-Type': 'application/javascript'});
-        response.end(fs.readFileSync('client/webrtc.js'));
-    }
+    request.addListener('end', () => {
+        file.serve(request, response);
+    }).resume();
 };
 
 var httpsServer = https.createServer(serverConfig, handleRequest);