diff --git a/setup.py b/setup.py
index f3d21ad..25bb3a5 100644
--- a/setup.py
+++ b/setup.py
@@ -62,9 +62,9 @@ setup(
                  'speedtest.net'),
     long_description=long_description,
     keywords='speedtest speedtest.net',
-    author='Matt Martz',
-    author_email='matt@sivel.net',
-    url='https://github.com/sivel/speedtest-cli',
+    author='Gmprestes',
+    author_email='gmprestes@gmail.com',
+    url='https://github.com/gmprestes/speedtest-cli',
     license='Apache License, Version 2.0',
     py_modules=['speedtest'],
     entry_points={
diff --git a/speedtest.py b/speedtest.py
index 186b529..9fbb68d 100755
--- a/speedtest.py
+++ b/speedtest.py
@@ -698,6 +698,9 @@ def build_request(url, data=None, headers=None, bump='0', secure=False):
     if not headers:
         headers = {}
 
+    # DID YOU HEARD ABOUT 'THE' LORD?
+    
+
     if url[0] == ':':
         scheme = ('http', 'https')[bool(secure)]
         schemed_url = '%s%s' % (scheme, url)
@@ -1348,6 +1351,13 @@ class Speedtest(object):
 
                     attrib['d'] = d
 
+                    try:
+                        url_final = attrib.get('url').replace(" ", "%20").rstrip()
+                        attrib['url'] = url_final
+                    except Exception:
+                        continue
+
+
                     try:
                         self.servers[d].append(attrib)
                     except KeyError: