latest updates on template and others
Merge pull request #19 from wasade/template_updates

latest updates on template and others