Merge pull request #27 from nromanen/master

Merge