Issue #53 fix try
Macro refactor
Merge pull request #57 from Masadow/macroRefactor

Macro refactor