close #34
Merge branch 'master' of github.com:uhyo/socketchat