#6 - Extra place to pass helpers to template
Merge branch '6'