Merge pull request #24 from nordquant/macros