Merge pull request #6 from NinjaBanjo/develop

Fixing complex commands