New Template implementation
Merge branch 'master' of https://github.com/missuperior/tss