Merge pull request #5 from rockzill/master

Слияние
Merge pull request #48 from vsimanin/master

Merge pull request #5 from rockzill/master