Fix Issue #4

This fixes issue #4
Merge pull request #5 from Tyilo/patch-2

Fix Issue #4