Merge pull request #1 from DGAH/master

同步更新