Updated main.js
Merge branch 'master' into dev