Merge pull request #59 from nromanen/master

m->e
Merge pull request #62 from nromanen/master

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

Edd