Merge pull request #54 from nromanen/master

m->e
few fixes
Merge pull request #57 from nromanen/edd

Edd