updates
Merge pull request #8 from jasonrojas/macro_cleanup

updates