Merge pull request #14 from nromanen/master

merge master->dmirty(10.1.14)