Merge pull request #58 from nromanen/master

Merge m->y
updated for review
Merge pull request #59 from nromanen/yurembo

Yurembo -> master