Merge branch 'jk/ansi-color'