Merge pull request #102 from jeffturcotte/master

Added custom template class option