code review
Merge branch 'master' of https://github.com/addonin/messenger