fix #196
Merge branch 'master' of github.com:disconnectme/disconnect