Some optimizations in base template
Merge branch 'master' of https://github.com/sarutobi/Rynda