Add template working
Merge branch 'b1' of https://github.com/raulmacarie/templates into b1