Fixed comments and text
Merge branch 'master' into gh-pages
Merge pull request #92 from alaframboise/gh-pages

Updated gh-pages