Fixes #32
Merge pull request #52 from leostera/master

Fixes #32