Fix #26

M
Merge pull request #27 from msimonin/fix26

Fix #26