Added more template selecting
Merge pull request #1 from craigmoussa/feature

Added more template selecting