Bugfixes etc
Merge branch 'master' of ssh://github.com/mseiwert/ws