Merge pull request #29 from nromanen/master

Merge