Fix #22
Merge pull request #1142 from charlycoste/fix-22

Fix #22