Merge pull request #3 from Aerolab/gh-pages

Typos
Merge pull request #4 from Aerolab/gh-pages

A couple extra changes
Merge remote-tracking branch 'guille/gh-pages' into gh-pages