diff --git a/src/rhosts.go b/src/rhosts.go
index aadc842..9399c4b 100644
--- a/src/rhosts.go
+++ b/src/rhosts.go
@@ -51,12 +51,14 @@ const GPL = `
 
 func main() {
 	exit := make(chan bool)
+	var webserver bool = false
 	var daemon bool = false
 	var interval int = 1440
 	var versionflag bool = false
 	var removetimestamp bool = false
 
 	// Parsing Flags
+	flag.BoolVar(&webserver, "s", false, "Turn on the Webserver")
 	flag.BoolVar(&daemon, "d", false, "Should this be run in daemon mode")
 	flag.IntVar(&interval, "t", 1440, "Minutes until next run of daemon")
 	flag.BoolVar(&versionflag, "version", false, "show version information")
@@ -83,8 +85,10 @@ func main() {
 	}
 
 	// Starting web server
-	go serve.Start(exit)
-
+	if (webserver == true){
+		go serve.Start(exit)
+		defer func(){<-exit}()
+	}
 	// Update the hosts file
 	if daemon == false {
 		err := hosts.Update()
@@ -112,5 +116,4 @@ func main() {
 			}
 		}
 	}
-	<-exit
 }
diff --git a/src/serve/serve.go b/src/serve/serve.go
index d20c9a7..e74750e 100644
--- a/src/serve/serve.go
+++ b/src/serve/serve.go
@@ -10,7 +10,7 @@ import (
 func Start(exit chan bool) {
 	config := cfg.Create()
 	if config.WebServer.Enabled == false {
-		log.Print("Made it this far")
+		log.Print("Webserver was disabled in the config file")
 		exit <- true
 		return
 	}