Merge pull request #43 from nromanen/master

m->e