Merge branch 'macros'