typo
Merge branch 'changes' into gh-pages