add some command
add some command
fix a method name
Merge branch 'master' into lhh_dev