Merge pull request #1 from Fresheyeball/develop

Develop
Merge pull request #2 from Fresheyeball/develop

Develop
bug in color definition fixed
compile