better check for ssh session
Merge branch 'master' of ssh://simon.psaux.de/home