Merge branch 'dev' into gh-pages
Merge pull request #3 from hukaitest/gh-pages

Merge branch 'dev' into gh-pages