Merge branch 'master' into gh-pages
v1.0.2

separate base.js
Merge branch 'gh-pages'