delete getName
add getName
Merge remote-tracking branch 'origin/master' into Ray
add getName
modified
Merge remote-tracking branch 'origin/jingxin' into Ray
*