Last changes
Merge branch 'master' of https://github.com/artem-bochkarev/master-work