Merge pull request #39 from kweek/master

color
hmm