Add more template args
Merge pull request #5 from abayer/add-template-args

Add more template args