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