Uri template support
Merge pull request #27 from adstage-david/uritemplates

Uri template support