Merge pull request #1 from tiansiyuan/master

update