refine the main.js
merge release-1.0 to develop