Added --color/--no-color options
Merge branch 'add_color_option'