Merge pull request #11 from nromanen/master

Merge 19.12
Merge pull request #15 from nromanen/krivorotenko

Merge pull request #11 from nromanen/master