Merge pull request #57 from nromanen/master

Merge m->k
before code review
Merge pull request #59 from nromanen/yurembo

Yurembo -> master
merge
Merge pull request #61 from nromanen/master

Merge