DRY-up macros
Merge pull request #10 from kgann/dry_macros

DRY-up macros