Fix Issue #20
Merge pull request #22 from MrFranke/patch-1

Fix Issue #20