Merge pull request #57 from nromanen/master

Merge m->k
before code review
merge