Merge pull request #1 from TrojanBox/master

bug fixed
Merge pull request #8 from chinaqishuai/master

Merge pull request #1 from TrojanBox/master