Merge branch 'Adding-JS-trial1'