Last changes
Merge branch 'master' of https://github.com/denismosolov/47hours_4