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

Working on documentation