can handle client disconnects
Merge branch 'master' of https://github.com/rbellido/fuzzy-hipster