Full support for adding templates
Merge pull request #43 from tetsuo13/add_template

Full support for adding templates