Fix #22
Merge pull request #26 from ggirou/fix#22

Fix #22