diff --git a/FlippR-Driver/cli/networking/flippR_driver_networking b/FlippR-Driver/cli/networking/flippR_driver_networking
index 8c2fc34..215d3c0 100755
Binary files a/FlippR-Driver/cli/networking/flippR_driver_networking and b/FlippR-Driver/cli/networking/flippR_driver_networking differ
diff --git a/FlippR-Driver/networking/CMakeLists.txt b/FlippR-Driver/networking/CMakeLists.txt
index b06a041..a67d5cb 100644
--- a/FlippR-Driver/networking/CMakeLists.txt
+++ b/FlippR-Driver/networking/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.6.2)
 project(flippR_driver_networking)
 
-set(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/cli/networking)
+set(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/bin/networking)
 set(SOURCES
         input/InputSocketHandler.cpp
         output/OutputRequestHandler.cpp
diff --git a/FlippR-Driver/networking/FlippRServer.cpp b/FlippR-Driver/networking/FlippRServer.cpp
index 3dba984..6e6dd2b 100644
--- a/FlippR-Driver/networking/FlippRServer.cpp
+++ b/FlippR-Driver/networking/FlippRServer.cpp
@@ -161,12 +161,10 @@ void FlippRServer::initialize_input_driver()
 
 int FlippRServer::main(const std::vector<std::string>& args)
 {
-  if(help_requested)
-    return Application::EXIT_OK;
-
-  while(true);
-  waitForTerminationRequest();
-
+  if(!help_requested)
+  {
+    waitForTerminationRequest();
+  }
   return Application::EXIT_OK;
 }