diff --git a/server.js b/server.js
index 4b8d272..e470012 100644
--- a/server.js
+++ b/server.js
@@ -4,6 +4,7 @@ var logging = require("./modules/logging");
 var clean = require("./modules/cleaner");
 var http = require("http");
 var mime = require("mime");
+var path = require("path");
 var url = require("url");
 var fs = require("fs");
 
@@ -46,6 +47,9 @@ function requestHandler(req, res) {
   request.url = url.parse(req.url, querystring);
   request.url.query = request.url.query || {};
 
+  // remove trailing and double slashes + other junk
+  request.url.pathname = path.resolve(request.url.pathname);
+
   var local_path = request.url.pathname.split("/")[1];
   console.log(request.method + " " + request.url.href);
   if (request.method == "GET" || request.method == "HEAD") {