Fixed conditional template criteria.
Merge pull request #37 from pjackson28/master

Fixed conditional template criteria