Merge branch 'master' into gh-pages
upgrade template, widget
v1.0.1

upgrade
Merge branch 'gh-pages'