Merge pull request #13 from nromanen/master

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

Merge pull request #13 from nromanen/master