Merge pull request #41 from nromanen/master

Merge
christmas merge
Merge pull request #44 from nromanen/krivorotenko

Krivorotenko