Templates optimizing
Merge branch 'master' of github.com:madesst/mandango