Adding URIs and other pertinent lookup checks.
Merge pull request #130 from Adron/master

Adding URIs and other pertinent lookup checks.
meeeeeeeeerge