Merge pull request #13 from AlexSYanai/development

Development
Merge pull request #14 from AlexSYanai/master

Merge pull request #13 from AlexSYanai/development