diff --git a/Makefile b/Makefile
index 3ff6d671..bc66eb5d 100644
--- a/Makefile
+++ b/Makefile
@@ -24,10 +24,9 @@ archive:
 
 web:
 	ifconfig | grep inet
-	python2 -m SimpleHTTPServer 2>> http.out
+	python3 scripts/serveit.py 2>> http.out
 
 tsweb:
 	ifconfig | grep inet
 	$(TSC) -w &
-	python2 -m SimpleHTTPServer 2>> http.out
-	#node ../nodejs-typescript-webserver/bin/FileServer.js .
+	python3 scripts/serveit.py 2>> http.out
diff --git a/scripts/serveit.py b/scripts/serveit.py
new file mode 100755
index 00000000..91fa6b6c
--- /dev/null
+++ b/scripts/serveit.py
@@ -0,0 +1,16 @@
+#!/usr/bin/env python3
+import http.server
+
+class MyHTTPRequestHandler(http.server.SimpleHTTPRequestHandler):
+    def end_headers(self):
+        self.send_my_headers()
+        http.server.SimpleHTTPRequestHandler.end_headers(self)
+
+    def send_my_headers(self):
+        self.send_header("Cache-Control", "no-cache, no-store, must-revalidate")
+        self.send_header("Pragma", "no-cache")
+        self.send_header("Expires", "0")
+
+
+if __name__ == '__main__':
+    http.server.test(HandlerClass=MyHTTPRequestHandler)