Merge pull request #1 from dayatang/master

合并作者更新