Merge pull request #1 from TrojanBox/master

bug fixed