Merge conflicts resolved
Merge pull request #45 from anatoliykmetyuk/develop

Merge conflicts resolved