Merge pull request #61 from nromanen/master

Merge
updated for review
Merge pull request #63 from nromanen/yurembo

Yurembo
Merge pull request #64 from nromanen/master

Merge