Merge pull request #2106 from danhunsaker/feature/uri-extensibility

Improved extensibility of the URI class