commit_ycm_1

asdf
Merge pull request #1 from yinchangming/master

pul_request_fz_1