Fix #75: throw invalid exception
Fix #75: macros don's share between child and parent templates
Merge remote-tracking branch 'origin/master'