changed js block
Merge branch 'master' into history