minor updates
Merge remote branch 'upstream/master'
Merge pull request #6 from greenlaw110/master

minor update on "template" string