Added overriding 'uri' property to config object
Merge branch 'added-config-uri-property'