Merge pull request #52 from nromanen/master

m->d
Merge pull request #56 from nromanen/master

ь
jan17
after merge