Merge pull request #11 from nromanen/master

Merge 19.12