Fix issue #21
Merge pull request #22 from SimonMarquis/hotfix-issue-21

Fix issue #21