Fixes #2
Merge pull request #3 from a-sassermann/guidos-issue

Fixes #2