clean code
clean code
merge unknwon master
merge unknwon and fix js error