Merge pull request #1 from LianScarlet/master

new ver
move js
Merge pull request #3 from LinZap/master

move js