Merge pull request #43 from Rodsevich/master

Fixes #42