Merge pull request #1 from Zhangjy123/master

zhangjiangying
some msg