Merge pull request #98 from dsteinich/master

PUBSTWO-1050 - Compilers
PUBSTWO-1050 - really remove the template