changes
merge
changes
knkln
delete useless code
Merge remote-tracking branch 'origin/master' into xumeei