Fixed template string issues
Merge pull request #85 from pjackson28/fixheadingstrings

Fixed template string issues