Merge pull request #1176 from Frenzie/master

First util.template encapsulated strings