Ensure URI's are escaped. Fixes #13