Optimise the template file
Merge pull request #13 from gmarty/optimise-tpl

Optimise the template file