Fixes #7
Merge branch 'master' of https://github.com/Etskh/tricity-new