Merge pull request #1 from liu21st/master

merge
Merge pull request #2 from liu21st/master

merge
Change-Id: I558f655f5259dec1cfc5ebefadea9ca957e2c61a
Merge pull request #2 from vus520/master

修正一处笔误，没有结束符