修复bug
this can run
exception
Merge 'zenan' to 'master'