Fixes #38.
Merge pull request #39 from frmwrk123/fix/TemplateHandler

Fixes #38.