fix
Merge branch 'master' of github.com:rakhmatulin/hackathon14