fix bug
Merge branch 'master' into send-register-email