diff --git a/bin/RokuWebDriver_linux b/bin/RokuWebDriver_linux
index 21d5d70..d6f1db3 100755
Binary files a/bin/RokuWebDriver_linux and b/bin/RokuWebDriver_linux differ
diff --git a/bin/RokuWebDriver_mac b/bin/RokuWebDriver_mac
index ddf2f3e..787bbe2 100755
Binary files a/bin/RokuWebDriver_mac and b/bin/RokuWebDriver_mac differ
diff --git a/bin/RokuWebDriver_win.exe b/bin/RokuWebDriver_win.exe
index b8dd5a0..3a88158 100755
Binary files a/bin/RokuWebDriver_win.exe and b/bin/RokuWebDriver_win.exe differ
diff --git a/src/httpServer/handlers.go b/src/httpServer/handlers.go
index 1779803..2b9437b 100755
--- a/src/httpServer/handlers.go
+++ b/src/httpServer/handlers.go
@@ -238,7 +238,7 @@ func (s *Server) GetTimeoutsHandler() appHandler {
             return &appError{ "The \"username\" field is required ", http.StatusBadRequest, nil}
         }
         pass := r.FormValue("password")
-        if  user == "" {
+        if  pass == "" {
             return &appError{ "The \"password\" field is required ", http.StatusBadRequest, nil}
         }
         res, err := plugin.Load(bytes.NewReader(buf.Bytes()), user, pass);
@@ -820,4 +820,4 @@ func (s *Server) GetSourceHandler() appHandler {
         }
     }
     return nodeArray
- }
\ No newline at end of file
+ }
diff --git a/src/httpServer/server.go b/src/httpServer/server.go
index 117e085..677bfbd 100755
--- a/src/httpServer/server.go
+++ b/src/httpServer/server.go
@@ -16,10 +16,11 @@
 package httpServer
 
 import (
-	"github.com/gorilla/mux"
 	ecp "ecpClient"
 	"net/http"
 	"time"
+
+	"github.com/gorilla/mux"
 	"github.com/sirupsen/logrus"
 )
 
@@ -46,9 +47,9 @@ func GetServerInstance() *Server {
 	return server
 }
 
-func (s *Server) Start() {
+func (s *Server) Start(port string) {
 	s.SetUpRoutes()
-	err := http.ListenAndServe(":9000", nil)
+	err := http.ListenAndServe(":" + port, nil)
 	if err != http.ErrServerClosed {
 	   logrus.WithError(err).Error("Http Server stopped unexpected")
 	} else {
diff --git a/src/main.go b/src/main.go
index 8993cb6..9d0de08 100755
--- a/src/main.go
+++ b/src/main.go
@@ -16,10 +16,21 @@
 package main
 
 import (
-    httpServer "httpServer"
+	"fmt"
+	httpServer "httpServer"
+	"os"
+	"regexp"
 )
 
 func main() {
-    server := httpServer.GetServerInstance()
-    server.Start()
-}
\ No newline at end of file
+	defaultPort := "9000"
+	validPort := regexp.MustCompile(`^[0-9]+$`)
+	server := httpServer.GetServerInstance()
+	if len(os.Args) > 1 && validPort.MatchString(os.Args[1]) {
+		fmt.Println("Starting driver on port: " + os.Args[1])
+		server.Start(os.Args[1])
+	} else {
+		fmt.Println("Starting driver on port: " + defaultPort)
+		server.Start(defaultPort)
+	}
+}