Few documentation updates
Merge pull request #529 from emmanuel-keller/master

Few documentation updates