Merge pull request #2 from TrojanBox/master

Merge pull request #1 from TrojanBox/development
Merge pull request #5 from TrojanBox/development

Merge pull request #2 from TrojanBox/master