diff --git a/citytrader/request_client.py b/citytrader/request_client.py
index <HASH>..<HASH> 100644
--- a/citytrader/request_client.py
+++ b/citytrader/request_client.py
@@ -2,17 +2,16 @@
 The RequestClient gets and refreshes tokens and also allows for resource requests.
 """
 
-import os
 import json
 import requests
 import base64
 from datetime import datetime, timedelta
-
+import urlparse
 
 class RequestClient():
     def __init__(self, server, client_id, client_secret, username, password):
         self.server = server
-        self.token_url = os.path.join(self.server, 'token')
+        self.token_url = urlparse.urljoin(self.server, 'token')
         self.client_id = client_id
         self.client_secret = client_secret
         self.authorization_header = {"Authorization": "Basic %s" % base64.b64encode(client_id + ":" + client_secret)}
@@ -101,8 +100,7 @@ class RequestClient():
             "Authorization": "Bearer %s" % self.access_token,
             "Content-Type": "application/json"
         }
-
-        request_url = os.path.join(self.server, url)
+        request_url = urlparse.urljoin(self.server, url)
 
         if request_type.lower() == "get":
             request_function = requests.get
Replaced os.path.join with urlparse.urljoin closing #1