no longer hangs on ssh
Merge branch 'master' of github.com:xmasotto/xhome