Fix Issue #53
Merge pull request #55 from christ66/master

Fix Issue #53