Templating 0.2.2

Petites modifications