Added color markup.
Added glyph count.
Merge pull request #1855 from davebaol/color

Added color markup.