More template parsing fixes.
Merge pull request #26 from r-e-d/master

More template parsing fixes.