Closes #53.
Merge pull request #54 from andreasots/issue-53

Closes #53.