Merge branch 'rs/grep-color-words'