Updated with new macros example from master