Fix #42
Merge pull request #48 from cvrebert/fix-42

Fix #42