Temporary template selection patch
Merge pull request #706 from Gravecorp/master

Temporary template selection patch