Merge remote-tracking branch 'jaimeMF/color_error_messages'