Simplified the handling of URI and URL locations.
Merge pull request #171 from cmiles74/master

Simplified the handling of URI and URL locations. Merging #171