Working on documentation
Merge pull request #368 from emmanuel-keller/1.5

Working on documentation