Fix/new template

Fixes #10