Merge pull request #48 from nromanen/master

m->d
after merge
merge e->m