fix typo
add button disable
Merge branch 'master' into gh-pages