Merge pull request #145 from mdlayher/master

Fix exception on invalid service
RESTful ID passing, by injecting ID parameter into UriWrapper
Force overwrite of ID with RESTful version, preventing exception if both used
Merge pull request #146 from mdlayher/api_uri_id

RESTful ID passing, by injecting ID parameter into UriWrapper