small fix
Merge remote-tracking branch 'origin/master'
macros for color
Merge remote-tracking branch 'origin/master'