Fix typo in documentation

Thanks @gdesjardins! Keep'em coming.
Update HTML doc
Merge branch 'master' into gh-pages