Merge pull request #17 from muddafudda/Colossus-dev

Merge pull request #16 from muddafudda/master
Merge pull request #18 from muddafudda/master

Merge pull request #17 from muddafudda/Colossus-dev