adding support for template tags
Merge pull request #334 from manishgkasera/master

adding support for template tags