Working on documentation
Merge pull request #408 from emmanuel-keller/master

Working on documentation