Update main.js
Merge pull request #1 from PatrickChen83/branch_12/30

Update main.js