Merge pull request #62 from nromanen/master

Merge
Merge pull request #64 from nromanen/master

Merge
Merge pull request #65 from nromanen/krivorotenko

Merge