Corrected conditional template loads.
Merge pull request #41 from pjackson28/master

Corrected conditional template loads