Merge pull request #16 from fschaer/fix3

Fix3
Merge pull request #17 from fschaer/templates

allow user-defined templates to be specified