Fix Issue #5
Merge pull request #22 from dbaumann/master

Fix Issue #5