Implements #8
Merge pull request #15 from emmanuel-keller/master

Implements #8