Fix Issue #37
Merge pull request #47 from christ66/master

Fix Issue #37