Updated to use RFC 3986 3.1