diff --git a/src/main.go b/src/main.go
index 807d2c3..de5b293 100644
--- a/src/main.go
+++ b/src/main.go
@@ -80,8 +80,8 @@ func signalEventLoop() {
     // subscribe to SIGHUP signal.
     signal.Notify(sig_ch, syscall.SIGHUP)
 
-    // Event loop (runs in a seperate thread)
-    go func() {
+    // Event loop
+    func() {
         for {
             // Block until we get a signal.
             sig := <- sig_ch
@@ -149,11 +149,11 @@ func main() {
         }
     }
 
-    // Run the signal event loop.
-    signalEventLoop()
-
     addr = argv_listen_addr()
 
     // Start listening to TCP Connections
     spawnTcpServer(addr);
+
+    // Run the signal event loop.
+    signalEventLoop()
 }
diff --git a/src/server.go b/src/server.go
index a6dad8d..566927b 100644
--- a/src/server.go
+++ b/src/server.go
@@ -52,5 +52,5 @@ func spawnTcpServer(addr string) {
     }
 
     logger.Info("TCP Server started", "addr", addr)
-    server.Listen()
+    go server.Listen()
 }