Fixed macro implementation
Merge pull request #2 from ritalin/fix-macro

Fixed macro implementation