Macro support
Merge branch 'master' of https://github.com/takenet/lime.git