Merge pull request #1 from vhf/master

合并更新