Merge pull request #43 from nromanen/master

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

Merge pull request #43 from nromanen/master