Merge pull request #1 from paul-ylz/master

Merge gh-pages and master