Merge pull request #71 from nromanen/master

m->e
Merge pull request #74 from nromanen/edd

Merge pull request #71 from nromanen/master