Added support for named arguments for macros
Added support for directly call macros defined in the same template