Merge pull request #25 from muddafudda/master

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

Merge pull request #25 from muddafudda/master