diff --git a/.travis.yml b/.travis.yml
index 5951c70f..2b77402d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 language: go
 
 go:
-  - go1.6
+  - go1.7
   - tip
diff --git a/README.md b/README.md
index f92e85ea..323edc92 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ Ideally suited for both experienced and novice Developers. <br/>
 
 Installation
 ------------
-The only requirement is the [Go Programming Language](https://golang.org/dl), at least v1.6
+The only requirement is the [Go Programming Language](https://golang.org/dl), at least v1.7
 
 ```bash
 $ go get -u github.com/kataras/iris/iris
diff --git a/ssh.go b/ssh.go
index 6b2010b4..cb678fd7 100644
--- a/ssh.go
+++ b/ssh.go
@@ -219,13 +219,13 @@ var (
 	SSHBanner = banner
 
 	helpMessage = SSHBanner + `
-	
+
 COMMANDS:
 	  {{ range $index, $cmd := .Commands }}
-		  {{- $cmd.Name }} - {{ $cmd.Description }}
+		  {{- $cmd.Name }} | {{ $cmd.Description }}
 	  {{ end }}
 USAGE:
-	  ssh myusername@{{ .Hostname}} -p {{ .Port }} {{ first .Commands}}
+	  ssh myusername@{{ .Hostname}} {{ .PortDeclaration }} {{ first .Commands}}
 	  or just write the command below
 VERSION:
 	  {{ .Version }}
@@ -482,7 +482,7 @@ func (s *SSHServer) writeHelp(wr io.Writer) {
 	hostname := parseHostname(s.Host)
 
 	data := map[string]interface{}{
-		"Hostname": hostname, "Port": port,
+		"Hostname": hostname, "PortDeclaration": "-p " + strconv.Itoa(port),
 		"Commands": append(s.Commands, standardCommands...),
 		"Version":  Version,
 	}