Added user defined annotations for variable substitution in templates
Updated readme