Fix Issue #49
Merge pull request #60 from christ66/master

Fix Issue #49