Merge pull request #1 from TrojanBox/development

Development