Rewrite parse_macro
Merge branch 'master' of https://github.com/Mause/javatar