Example template macro added
Template macro improved