Added support for URIs when connecting #3 #4