Merge pull request #7 from muddafudda/master

Merge
Update version.h
Merge pull request #8 from muddafudda/Colossus-dev

Colossus dev