Merge pull request #1 from serieznyi/develop

Merge develop to master