Switch to mako templates
Switch to mako templates
Merge pull request #6 from marek-leszczynski/bug_2021

Bug 2021