Merge pull request #1 from Yexiaoxing/master

update