Sanitize macros
Merge pull request #4 from andrewgaul/sanitize-macros

Sanitize macros