Merge pull request #21 from NicolasPetton/master

Fixes #20