Better management of URL encoding - fix for issue #15