Merge pull request #1 from thinkgem/master

同步