Added macro definition tab.
Merge remote-tracking branch 'Lights/master'