Fix #53
Merge pull request #57 from madflow/issue-53

Fix #53