modified javascruot code
Merge branch 'beta'