Merge pull request #27 from before/uri-fixes-and-improvements

Enhancements and Fixes around `Uri`