Merge pull request #32 from muddafudda/Colossus-dev

Colossus dev