it's too late
update conf example
Merge branch 'master' into 256color

Conflicts:
	tunnels