Back to non-template form
Merge pull request #3 from JulianJaffe/master

Back to non-template form