added rfc3617 uri support