Merge branch 'master' into gh-pages
fix #2
Merge branch 'gh-pages'