Fixes #151 and #173

Apply fix suggested by @jcsahnwaldt
Merge pull request #174 from ninniuz/151_server_extraction_example_url_encode

Fixes #151 and #173