Merge pull request #1 from MagicBlocks/master

合并你的代码