Fix #46
Merge pull request #47 from cvrebert/fix-46

Fix #46