Typos and rewriting of some parts of the doc
Merge remote-tracking branch 'origin/master'