Fixed js bug
Merge branch 'issue-120' into develop