Some fixes I don't want to describe
Merge branch 'master' of https://github.com/alexeyev/kashpirovsky