Merge pull request #23 from muddafudda/master

Merge
Merge pull request #24 from muddafudda/Colossus-dev

Merge pull request #23 from muddafudda/master