Merge pull request #6 from EugeneKha/master

Merge pull request #5 from EugeneKha/develop
Merge pull request #7 from EugeneKha/develop

Merge pull request #6 from EugeneKha/master