Use rawurlencode for RFC 3986 encoding of spaces
Manually merge files for pull request #4