Added support for non HTTP/S URLs