Bug fixes for template_filler
Merge branch 'master' of https://github.com/pruzanov/ME.scripts