Replace encodeURI with RFC3986-compliant version
Merge pull request #4 from bmcbarron/master

Replace encodeURI with RFC3986-compliant version