Template Toolkit changes. Resolves #36