Merge pull request #1 from wakaDemo/WAK8

FIXED: templates
FIXED: default template rendering
Merge pull request #2 from wakaDemo/master

master merge