Templates handling : OK

Issue #7 closed