Fixes #22
Merge pull request #24 from daitel/bug_22_daitel

Fixes #22