Merge pull request #1 from jbruchanov/develop

Merge to master