Merge pull request #1 from TrojanBox/development

Development
Merge pull request #3 from TrojanBox/development

Merge origin/master into development
Merge pull request #4 from chinaqishuai/master

Test
Merge pull request #2 from TrojanBox/master

Merge pull request #1 from TrojanBox/development