ticket:8 some fix
ticket:8 js
master Merge branch 't8_fix'