minor fix for units in js
Merge branch 'master' into gh-pages