Reordered macro replacement
Merge pull request #4 from flite/macros

Reordered macro replacement