template optimizations
Merge pull request #8 from futekov/template-improvements

template optimizations