Fix/template

see #89