Fix #57
Merge pull request #64 from cvrebert/fix-57

Fix #57