Fixing colors, see #29
Merge pull request #30 from bluehawk/develop-2

Fixing colors, see #29