Updates
Merge pull request #11 from difleming/api-templates

Updates