Macro support added
Merge branch 'master' of https://github.com/irdvo/htmloo