Merge pull request #27 from nromanen/master

Merge
Merge pull request #28 from nromanen/dmitry

Merge pull request #27 from nromanen/master