typo
Merge remote-tracking branch 'origin/master'
Merge pull request #6 from DGAH/master

合并原作者更新