diff --git a/.goxc.json b/.goxc.json
index b2a0fa2e9..ec2e8ad3d 100644
--- a/.goxc.json
+++ b/.goxc.json
@@ -22,6 +22,6 @@
     "BuildConstraints": "darwin,!386 linux windows freebsd,!arm",
     "ResourcesExclude": "*.go .goxc-temp",
     "MainDirsExclude": "vendor,Godeps,testdata",
-    "PackageVersion": "2.6.0+dev",
+    "PackageVersion": "2.7.0",
     "ConfigVersion": "0.9"
 }
diff --git a/README.md b/README.md
index c6ba3c296..2230a7320 100644
--- a/README.md
+++ b/README.md
@@ -555,7 +555,7 @@ USAGE:
    assh [global options] command [command options] [arguments...]
 
 VERSION:
-   2.6.0 (HEAD)
+2.7.0 (HEAD)
 
 AUTHOR(S):
    Manfred Touron <https://github.com/moul/advanced-ssh-config>
@@ -797,7 +797,7 @@ Convert an `assh.yml` file to `ssh_config` format:
 
 ```console
 $ http --form POST https://assh-dev.herokuapp.com/assh-to-ssh assh_config=@~/.ssh/assh.d/test.yml | jq -r .ssh_config
-# This file was automatically generated by assh v2.6.0
+# This file was automatically generated by assh v2.7.0
 # on 2017-01-31 21:06:56 +0000 UTC, based on ~/.ssh/assh.yml
 #
 # more info: https://github.com/moul/advanced-ssh-config
@@ -829,7 +829,7 @@ Host *
 
 ## Changelog
 
-### master (unreleased)
+### v2.7.0 (2017-10-24)
 
 * Automatically detect available shell when using the 'exec' hook ([#254](https://github.com/moul/advanced-ssh-config/issues/254))
 * Automatically detect if `-q` is passed to the parent ssh process to disable logging ([#253](https://github.com/moul/advanced-ssh-config/pull/253)) by [@cao](https://github.com/cao)
@@ -847,7 +847,7 @@ Host *
 * Generate full assh binary path in ~/.ssh/config ([#148](https://github.com/moul/advanced-ssh-config/issues/148))
 * Initial version of `assh ping` command
 
-[Full commits list](https://github.com/moul/advanced-ssh-config/compare/v2.6.0...master)
+[Full commits list](https://github.com/moul/advanced-ssh-config/compare/v2.6.0...v2.7.0)
 
 ### v2.6.0 (2017-02-03)
 
diff --git a/examples/gateways-wildcard/ssh_config b/examples/gateways-wildcard/ssh_config
index b6de1c8f6..0af9dbc7d 100644
--- a/examples/gateways-wildcard/ssh_config
+++ b/examples/gateways-wildcard/ssh_config
@@ -1,5 +1,5 @@
-# This file was automatically generated by assh v2.6.0+dev
-# on 2017-04-07 13:24:43 +0200 CEST, based on ~/.ssh/assh.yml
+# This file was automatically generated by assh v2.7.0
+# on 2017-10-24 10:10:29 +0200 CEST, based on ~/.ssh/assh.yml
 #
 # more info: https://github.com/moul/advanced-ssh-config
 
@@ -12,4 +12,4 @@ Host tricky
 
 # global configuration
 Host *
-  ProxyCommand ./assh connect --port=%p %h
+  ProxyCommand /Users/moul/Git/moul/advanced-ssh-config/assh connect --port=%p %h
diff --git a/examples/readme-example-gateways/graphviz.dot b/examples/readme-example-gateways/graphviz.dot
index 7f175bdbe..e6a41053a 100644
--- a/examples/readme-example-gateways/graphviz.dot
+++ b/examples/readme-example-gateways/graphviz.dot
@@ -1,7 +1,7 @@
 digraph G {
+	"hostb"->"hosta"[ color=red, label=1 ];
 	"hostc"->"hostb"[ color=red, label=1 ];
 	"hostd"->"hosta"[ color=red, label=1 ];
-	"hostb"->"hosta"[ color=red, label=1 ];
 	"hosta" [ color=blue ];
 	"hostb" [ color=blue ];
 	"hostc" [ color=blue ];
diff --git a/examples/readme-example-gateways/graphviz.png b/examples/readme-example-gateways/graphviz.png
index 10fc4640e..e14b04e20 100644
Binary files a/examples/readme-example-gateways/graphviz.png and b/examples/readme-example-gateways/graphviz.png differ
diff --git a/examples/readme-example-gateways/ssh_config b/examples/readme-example-gateways/ssh_config
index 311da266f..111ca8333 100644
--- a/examples/readme-example-gateways/ssh_config
+++ b/examples/readme-example-gateways/ssh_config
@@ -1,5 +1,5 @@
-# This file was automatically generated by assh v2.6.0+dev
-# on 2017-04-07 13:24:43 +0200 CEST, based on ~/.ssh/assh.yml
+# This file was automatically generated by assh v2.7.0
+# on 2017-10-24 10:10:29 +0200 CEST, based on ~/.ssh/assh.yml
 #
 # more info: https://github.com/moul/advanced-ssh-config
 
@@ -21,4 +21,4 @@ Host hostd
 
 # global configuration
 Host *
-  ProxyCommand ./assh connect --port=%p %h
+  ProxyCommand /Users/moul/Git/moul/advanced-ssh-config/assh connect --port=%p %h
diff --git a/examples/readme-full-example/graphviz.dot b/examples/readme-full-example/graphviz.dot
index a69b07817..2f8d5807e 100644
--- a/examples/readme-full-example/graphviz.dot
+++ b/examples/readme-full-example/graphviz.dot
@@ -1,7 +1,7 @@
 digraph G {
-	"bart"->"homer"[ color=red, label=1 ];
 	"vm-*.school.com"->"schoolgw"[ color=red, label=1 ];
 	"vm-*.school.com"->"schooltemplate"[ color=black, style=dashed ];
+	"bart"->"homer"[ color=red, label=1 ];
 	"bart" [ color=blue ];
 	"homer" [ color=blue ];
 	"schoolgw" [ color=blue ];
diff --git a/examples/readme-full-example/graphviz.png b/examples/readme-full-example/graphviz.png
index 201aa911a..8c4826cfb 100644
Binary files a/examples/readme-full-example/graphviz.png and b/examples/readme-full-example/graphviz.png differ
diff --git a/examples/readme-full-example/ssh_config b/examples/readme-full-example/ssh_config
index c48f33f15..ac1fee102 100644
--- a/examples/readme-full-example/ssh_config
+++ b/examples/readme-full-example/ssh_config
@@ -1,5 +1,5 @@
-# This file was automatically generated by assh v2.6.0+dev
-# on 2017-04-07 13:24:43 +0200 CEST, based on ~/.ssh/assh.yml
+# This file was automatically generated by assh v2.7.0
+# on 2017-10-24 10:10:29 +0200 CEST, based on ~/.ssh/assh.yml
 #
 # more info: https://github.com/moul/advanced-ssh-config
 
@@ -105,4 +105,4 @@ Host *
   Port 22
   User bob
   ProxyCommand /Users/moul/bin/assh connect --port=%p %h
-  # Hooks: {"OnConnect":["exec echo {{.}} | jq . \u003e\u003e ~/.ssh/last_connected_host.txt","notify New SSH connection to {{.Host.Prototype}} at {{.Stats.ConnectedAt}}","write New SSH connection to {{.Host.Prototype}}"],"OnDisconnect":["write  SSH connection to {{.Host.HostName}} closed, {{.Stats.WrittenBytes }} bytes written in {{.Stats.ConnectionDuration}} ({{.Stats.AverageSpeed}}bps)","notify SSH connection to {{.Host.HostName}} closed, {{.Stats.WrittenBytes }} bytes written in {{.Stats.ConnectionDuration}} ({{.Stats.AverageSpeed}}bps)"]}
+  # Hooks: {"AfterConfigWrite":["exec cat ~/.ssh/my-heroku-generated-config \u003e\u003e {{.SSHConfigPath}}","notify \"{{.SSHConfigPath}} has been rewritten\""],"BeforeConfigWrite":["exec set -x; cp {{.SSHConfigPath}} {{.SSHConfigPath}}.bkp"],"OnConnect":["exec echo {{.}} | jq . \u003e\u003e ~/.ssh/last_connected_host.txt","notify New SSH connection to {{.Host.Prototype}} at {{.Stats.ConnectedAt}}","write New SSH connection to {{.Host.Prototype}}"],"OnDisconnect":["write  SSH connection to {{.Host.HostName}} closed, {{.Stats.WrittenBytes }} bytes written in {{.Stats.ConnectionDuration}} ({{.Stats.AverageSpeed}}bps)","notify SSH connection to {{.Host.HostName}} closed, {{.Stats.WrittenBytes }} bytes written in {{.Stats.ConnectionDuration}} ({{.Stats.AverageSpeed}}bps)"]}
diff --git a/examples/readme-troubleshooting-gateways/ssh_config b/examples/readme-troubleshooting-gateways/ssh_config
index 8322b92a7..c1cd1cb87 100644
--- a/examples/readme-troubleshooting-gateways/ssh_config
+++ b/examples/readme-troubleshooting-gateways/ssh_config
@@ -1,5 +1,5 @@
-# This file was automatically generated by assh v2.6.0+dev
-# on 2017-04-07 13:24:43 +0200 CEST, based on ~/.ssh/assh.yml
+# This file was automatically generated by assh v2.7.0
+# on 2017-10-24 10:10:30 +0200 CEST, based on ~/.ssh/assh.yml
 #
 # more info: https://github.com/moul/advanced-ssh-config
 
@@ -12,4 +12,4 @@ Host myserver
 
 # global configuration
 Host *
-  ProxyCommand ./assh connect --port=%p %h
+  ProxyCommand /Users/moul/Git/moul/advanced-ssh-config/assh connect --port=%p %h
diff --git a/examples/resolvecommand-with-gateway/ssh_config b/examples/resolvecommand-with-gateway/ssh_config
index 8d596549c..4acdd937e 100644
--- a/examples/resolvecommand-with-gateway/ssh_config
+++ b/examples/resolvecommand-with-gateway/ssh_config
@@ -1,5 +1,5 @@
-# This file was automatically generated by assh v2.6.0+dev
-# on 2017-05-29 22:53:58 +0200 CEST, based on ~/.ssh/assh.yml
+# This file was automatically generated by assh v2.7.0
+# on 2017-10-24 10:10:30 +0200 CEST, based on ~/.ssh/assh.yml
 #
 # more info: https://github.com/moul/advanced-ssh-config
 
diff --git a/examples/resolvecommand-with-gateway/test.log b/examples/resolvecommand-with-gateway/test.log
index c6283c7ab..102ac9945 100644
--- a/examples/resolvecommand-with-gateway/test.log
+++ b/examples/resolvecommand-with-gateway/test.log
@@ -6,10 +6,10 @@ level=info msg="  Port 22"
 level=info msg="  # HostName: a" 
 level=info msg="  # Gateways: [b/c]" 
 level=info msg="  # ResolveCommand: echo h=%h p=%p name=%name n=%n g=%g" 
-level=debug msg="Host: {\"Port\":\"22\",\"HostName\":\"a\",\"Gateways\":[\"b/c\"],\"ResolveCommand\":\"echo h=%h p=%p name=%name n=%n g=%g\",\"Hooks\":{}}" 
+level=debug msg="Host: {"Port":"22","HostName":"a","Gateways":["b/c"],"ResolveCommand":"echo h=%h p=%p name=%name n=%n g=%g","Hooks":{}}" 
 level=debug msg=Proxying 
 level=debug msg="Trying gateways: [b/c]" 
-level=debug msg="Resolving host: \"a\" using command: \"echo h=%h p=%p name=%name n=%n g=%g\"" 
+level=debug msg="Resolving host: "a" using command: "echo h=%h p=%p name=%name n=%n g=%g"" 
 level=debug msg="Resolved host is: h=a p=22 name=a n=a g=b/c" 
 level=debug msg="Using gateway 'b/c': ssh -W h=a p=22 name=a n=a g=b/c:22 %name" 
 level=debug msg="ProxyCommand: ssh -W h=a p=22 name=a n=a g=b/c:22 b/c" 
diff --git a/examples/same-option-multiple-times/ssh_config b/examples/same-option-multiple-times/ssh_config
index e8e99beea..5a4048496 100644
--- a/examples/same-option-multiple-times/ssh_config
+++ b/examples/same-option-multiple-times/ssh_config
@@ -1,5 +1,5 @@
-# This file was automatically generated by assh v2.6.0+dev
-# on 2017-05-29 21:25:07 +0200 CEST, based on ~/.ssh/assh.yml
+# This file was automatically generated by assh v2.7.0
+# on 2017-10-24 10:10:30 +0200 CEST, based on ~/.ssh/assh.yml
 #
 # more info: https://github.com/moul/advanced-ssh-config
 
diff --git a/pkg/version/version.go b/pkg/version/version.go
index c9573297f..f5bbd933d 100644
--- a/pkg/version/version.go
+++ b/pkg/version/version.go
@@ -2,7 +2,7 @@ package version
 
 var (
 	// Version should be updated by hand at each release
-	VERSION = "2.6.0+dev"
+	VERSION = "2.7.0"
 	// GitCommit will be overwritten automatically by the build system
 	GITCOMMIT = "HEAD"
 )