fix js error
fix bug
Merge branch 'origin/master'
update config