Tabs are killing unicorns so use spaces instead
Add colorize option
Merge remote-tracking branch 'origin/master'