Removed colors, not compatible with mac
Merge remote-tracking branch 'origin/master'