Add: yang's gmail
Add a note
Merge branch 'yang' into dev