Fixes #55
Merge pull request #56 from sbellem/issue-55

Fixes #55