Fix #45
Merge pull request #55 from cvrebert/fix-45

Fix #45