Remove macros
Merge pull request #19 from mmun/remove-macros

Remove macros