Merge pull request #6 from piercalex/master

1027joe部分提交
1027 情报员没提交的
Merge pull request #33 from chuyu123/master

1027 合并