Merge pull request #16 from NicolasPetton/master

Fixes #15