revert color merge
Merge pull request #32 from lifey/master

revert color merge