Fixes #20
Merge pull request #33 from waalt/bugfix20

Fixes #20