FIXED: templates
Merge pull request #1 from wakaDemo/WAK8

FIXED: templates