Color fix
Merge pull request #117 from ksin/color-fixes

Color fix