Small upd
Full update
Merge branch 'master' of https://github.com/dozerka/master