fix math.js
Merge branch 'master' into templates