Merge pull request #38 from nromanen/master

Merge
Merge pull request #40 from nromanen/krivorotenko

Merge pull request #38 from nromanen/master