Typo corrections by @romainlebreton
Merge branch 'boilerplate' into gh-pages