Merge pull request #61 from nromanen/master

m->k
Merge pull request #64 from nromanen/master

m->k
Merge pull request #67 from nromanen/kirill

Kirill