Merge pull request #1 from akunap2/develop

Develop
Merge pull request #2 from akunap2/master

Merge pull request #1 from akunap2/develop