#137 - Fixed variable expansion in UriTemplate.