Some more coloring
Merge remote-tracking branch 'Vektah/master' into coloring
Merge pull request #24 from asheb/coloring

Little coloring enhancement