Merge pull request #35 from nromanen/master

Merge
Merge pull request #36 from nromanen/yurembo

Merge