Merge pull request #15 from ZuzuStudio/master

синхронизация
Merge pull request #16 from ZuzuStudio/sasha

Merge pull request #15 from ZuzuStudio/master