Merge pull request #1 from rockzill/master

TEST=)
Merge pull request #3 from vsimanin/master

Merge pull request #1 from rockzill/master