diff --git a/src/audiomass-server.py b/src/audiomass-server.py
index 15ae2c1..f10b036 100644
--- a/src/audiomass-server.py
+++ b/src/audiomass-server.py
@@ -1,7 +1,9 @@
-import SimpleHTTPServer
-import SocketServer
-PORT = 5055 
-Handler = SimpleHTTPServer.SimpleHTTPRequestHandler
-httpd = SocketServer.TCPServer(("", PORT), Handler)
-print "serving at port", PORT
-httpd.serve_forever()
\ No newline at end of file
+import http.server
+import socketserver
+
+PORT = 5055
+Handler = http.server.SimpleHTTPRequestHandler
+
+with socketserver.TCPServer(("", PORT), Handler) as httpd:
+    print("serving at port", PORT)
+    httpd.serve_forever()