besseres handling für leavende clients
Merge branch 'master' of github.com:nikithase/working-title