Merge pull request #1 from neildavis/master

Add URL decoding of query string params
Merge remote-tracking branch 'upstream/master'