修改注册
Merge branch 'master' into launch