ticket:6 fixed js
Merge branch 'ticket_6'