Use string templates for macros
Merge pull request #8 from kirbyfan64/master

Use string templates for macros