update format
merge the email and format
Merge branch 'master' of https://github.com/siqingdu/test

Conflicts:
	README.md