fixed #64
Merge branch 'bug/64-butler-2-templates' into dev