Typo :s,
Merge branch 'gh-pages'