Merge pull request #6 from valeravorobjev/dev

Stable
Merge pull request #7 from valeravorobjev/master

Merge pull request #6 from valeravorobjev/dev