Fix typo
Fix typo
merge changes
Merge branch 'bycoffe-patch-1' into gh-pages