Merge pull request #2 from muddafudda/master

Update Dev
Merge pull request #3 from muddafudda/Colossus-dev

Merge pull request #2 from muddafudda/master