Merge pull request #50 from nromanen/master

Merge m->k
Merge pull request #52 from nromanen/krivorotenko

Merge k->m