improved templates
released v1.2