Merge pull request #1 from paul-ylz/master

Merge gh-pages and master
Merge pull request #2 from paul-ylz/gh-pages

Merge pull request #1 from paul-ylz/master