Add coloring option (--color).
Prototype version of coloring.
Merge branch 'master' into coloring