tracker modified
merge with develop
chinese support