Merge branch 'origin/master'
Merge pull request #1 from y08507/gh-pages

Merge branch 'origin/master'