update main.js from master