Merge pull request #13 from nromanen/master

merge master->edd(10.1.14)