Merge remote-tracking branch 'origin/gh-pages'
Merge pull request #1 from Y30130/master

Merge remote-tracking branch 'origin/gh-pages'