Merge branch 'master' into gh-pages
add select button
Merge branch 'gh-pages'