diff --git a/Makefile b/Makefile
index bab17ed3..a29943f7 100644
--- a/Makefile
+++ b/Makefile
@@ -33,6 +33,9 @@ ci: check binaries checkprotos coverage coverage-integration ## to be used by th
 
 setup: ## install dependencies
 	@echo "🎈 $@"
+	@go get -u github.com/golang/lint/golint
+	@go get -u github.com/gordonklaus/ineffassign
+	@go get -u github.com/client9/misspell/cmd/misspell
 	@go get -u github.com/Masterminds/glide
 	@glide install
 
diff --git a/README.md b/README.md
index 45419803..50b77f60 100644
--- a/README.md
+++ b/README.md
@@ -9,14 +9,10 @@ Wormhole is a reverse proxy that creates a secure tunnel between two endpoints.
 ## Compiling
 **Wormhole requires Go1.7+**
 
-    go get github.com/Masterminds/glide
-    mkdir -p $GOPATH/github.com/superfly
-    cd $GOPATH/src/github.com/superfly
-    git clone git@github.com:superfly/wormhole.git
-    cd wormhole
-    glide install
-    go build github.com/superfly/wormhole/cmd/wormhole
-
+    go get github.com/superfly/wormhole
+    cd $GOPATH/src/github.com/superfly/wormhole
+    make setup
+    make binaries
 
 ## Running locally
 
diff --git a/local/ssh_handler.go b/local/ssh_handler.go
index 8a6bc07a..06862786 100644
--- a/local/ssh_handler.go
+++ b/local/ssh_handler.go
@@ -172,7 +172,7 @@ func (s *SSHHandler) stayAlive() {
 
 			if needReply && replyLatency > maxKeepaliveLatency {
 				s.logger.Infof("Last Keepalive: %v, Last Keepalive reply: %v", lastKeepalive, lastKeepaliveReply)
-				err := fmt.Errorf("Connection stale, haven't gotten Keepalive reply in %d seconds. Closing connection.", int(replyLatency.Seconds()))
+				err := fmt.Errorf("ssh_handler: connection stale, haven't gotten keepalive reply in %d seconds", int(replyLatency.Seconds()))
 				s.shutdown.Begin(err)
 				return
 			}