Fix #20
Merge pull request #1139 from charlycoste/fix-20

Fix #20