diff --git a/catalyst/constants.py b/catalyst/constants.py
index 912d3894..b29d6f62 100644
--- a/catalyst/constants.py
+++ b/catalyst/constants.py
@@ -27,20 +27,20 @@ AUTH_SERVER = 'https://data.enigma.co'
 # TODO: switch to mainnet
 ETH_REMOTE_NODE = 'https://ropsten.infura.io/'
 
-# TODO: move to MASTER branch on github
+
 MARKETPLACE_CONTRACT = 'https://raw.githubusercontent.com/enigmampc/' \
-                       'catalyst/develop/catalyst/marketplace/' \
+                       'catalyst/master/catalyst/marketplace/' \
                        'contract_marketplace_address.txt'
 
 MARKETPLACE_CONTRACT_ABI = 'https://raw.githubusercontent.com/enigmampc/' \
-                           'catalyst/develop/catalyst/marketplace/' \
+                           'catalyst/master/catalyst/marketplace/' \
                            'contract_marketplace_abi.json'
 
 # TODO: switch to mainnet
 ENIGMA_CONTRACT = 'https://raw.githubusercontent.com/enigmampc/catalyst/' \
-                  'develop/catalyst/marketplace/' \
+                  'master/catalyst/marketplace/' \
                   'contract_enigma_address.txt'
 
 ENIGMA_CONTRACT_ABI = 'https://raw.githubusercontent.com/enigmampc/' \
-                      'catalyst/develop/catalyst/marketplace/' \
+                      'catalyst/master/catalyst/marketplace/' \
                       'contract_enigma_abi.json'
diff --git a/catalyst/marketplace/marketplace.py b/catalyst/marketplace/marketplace.py
index a1ac263c..731f116a 100644
--- a/catalyst/marketplace/marketplace.py
+++ b/catalyst/marketplace/marketplace.py
@@ -58,9 +58,10 @@ class Marketplace:
         self.web3 = Web3(HTTPProvider(ETH_REMOTE_NODE))
 
         contract_url = urllib.urlopen(MARKETPLACE_CONTRACT)
-
+        
         self.mkt_contract_address = Web3.toChecksumAddress(
-            contract_url.readline().strip())
+            contract_url.readline().decode(
+                contract_url.info().get_content_charset()).strip())
 
         abi_url = urllib.urlopen(MARKETPLACE_CONTRACT_ABI)
         abi = json.load(abi_url)
@@ -71,9 +72,10 @@ class Marketplace:
         )
 
         contract_url = urllib.urlopen(ENIGMA_CONTRACT)
-
+  
         self.eng_contract_address = Web3.toChecksumAddress(
-            contract_url.readline().strip())
+            contract_url.readline().decode(
+                contract_url.info().get_content_charset()).strip())
 
         abi_url = urllib.urlopen(ENIGMA_CONTRACT_ABI)
         abi = json.load(abi_url)