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

Working on documentation