fixed objectURI
fixed conflict
Merge pull request #29 from ljwolford/perf

fixed objectURI