Updated to handle URL encoding properly.
Update with a couple comments.