Work on doc
Implements #29
Implements #29
Merge pull request #30 from emmanuel-keller/master

Implements #29