Fix #53
Merge pull request #54 from sourceLair/issue-53

Fix #53