fixed js bug
Merge branch 'master' into link