1 files changed, 8 insertions, 3 deletions
diff --git a/cbc/server.py b/cbc/server.py
index 5582281..ee451ac 100644
--- a/cbc/server.py
+++ b/cbc/server.py
@@ -4,14 +4,19 @@ import socketserver
 
 
 class FileServer(object):
-    def __init__(self, port, root=os.curdir):
+    def __init__(self, port, root=os.path.abspath(os.curdir), run=False):
         if isinstance(port, str):
             port = int(port)
-            
+
+        self.root = root
         self.port = port
         self.handler = http.server.SimpleHTTPRequestHandler
 
+        if run:
+            self.run()
+
     def run(self):
+        os.chdir(self.root)
         httpd = socketserver.TCPServer(("", self.port), self.handler)
         print("{0} active on port {1}".format(self.__class__.__name__, self.port))
-        httpd.serve_forever()
-\ No newline at end of file
+        httpd.handle_request()
+\ No newline at end of file