fixes #1 adds configurable templates and usage
merge