0.0.10 - Better handling of macros