Fix issue #2 — Encode special characters in URL

Fix issue #2 — Encode special characters in URL