Correctly check values
Fix previous commit
Update regenerated js files
Merge branch 'master' into gh-pages