fixed grepcolor bug
Merge branch 'gavin'