- update documentation & fix typos
Merge pull request #2565 from nicolasricci/master

- update documentation & fix typos