Merge pull request #69 from nromanen/master

Merge
Merge pull request #70 from nromanen/krivorotenko

Merge