Fix #21
Merge pull request #1141 from charlycoste/fix-21

Fix #21