Implements #34
Merge pull request #35 from emmanuel-keller/master

Implements #34