Merge pull request #3 from majorcheng/Diplomatic

Diplomatic
fix崩溃bug

NULL了
Merge pull request #4 from majorcheng/master

bug fix