Merge pull request #29 from muddafudda/master

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

Merge pull request #29 from muddafudda/master