Merge pull request #985 from TheBlueMatt/uri