#JC-1378:
* Refactor code according to Code Review
Merge branch 'master' of github.com:jtalks-org/jcommune