Merge pull request #1 from serieznyi/develop

Merge develop to master
Merge pull request #2 from serieznyi/master

Merge pull request #1 from serieznyi/develop