Merge pull request #7 from ollietb/master

merge from ollietb
URL-encode GET query values
Merge pull request #13 from rmasters/master

URL-encode query string params