Merge pull request #2 from zlotylesk/develop

Develop
Merge pull request #3 from zlotylesk/master

Merge pull request #2 from zlotylesk/develop