pre review ready
Merge pull request #17 from nromanen/dmitry

merge dmitry->master(10.1.14_2)