fixed disabled states on buttons
Merge branch 'master' into gh-pages