Handle URLs with extra parameters in them. Fixes #18