update script.js
Merge branches 'master' and 'jony'