Fixed bugs when URL was encoded before
Merge pull request #1 from thewavelength/patch-1

Fixed bugs when URL was encoded before