Merge pull request #1 from jbruchanov/develop

Merge to master
Merge pull request #2 from jbruchanov/master

Merge pull request #1 from jbruchanov/develop