Merge branch 'gh-pages'
update
Merge branch 'master' into gh-pages
up
Merge pull request #2 from qinjker/gh-pages

jker_pull_request