Template fix
Merge pull request #3 from methodx/develop

Template fix
new template generator

Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>