Merge pull request #20 from nromanen/master

merge master->edd(10.1.14_2)
Merge pull request #21 from nromanen/edd

Merge pull request #20 from nromanen/master