#14 Template tweaks

Fixes #14