FIXED: templates
Merge pull request #10 from wakaDemo/master

FIXED: templates