additional fixes for templates
Merge pull request #35 from rnecesito/master

additional fixes for templates