Proposed fix for issue #31
Merge pull request #32 from bratkartoffel/issue31

Proposed fix for issue #31