Merge pull request #14 from muddafudda/master

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

Merge pull request #14 from muddafudda/master