conform with RFC 3986
Merge pull request #18 from LinusU/master

conform with RFC 3986