完善注释
Merge remote-tracking branch 'xiyang/master'