Merge pull request #20 from nromanen/master

merge master->edd(10.1.14_2)