fixed button disabling
Merge branch 'master' into gh-pages