diff --git a/lib/kredits.js b/lib/kredits.js
index 5ec030a..541d362 100644
--- a/lib/kredits.js
+++ b/lib/kredits.js
@@ -22,16 +22,17 @@ function capitalize(word) {
 
 class Kredits {
 
-  constructor(provider, signer, addresses) {
+  constructor(provider, signer, options = {}) {
+    let { addresses, abis, ipfsConfig } = options;
+
     this.provider = provider;
     this.signer = signer;
-
     // by default we only need the registry address.
     // the rest is loaded from there in the init() function
-    this.addresses = addresses || {Registry: RegistryAddress[this.provider.chainId.toString()]}; // chaiID must be a string
-    this.abis = ABIS;
+    this.addresses = addresses || { Registry: RegistryAddress[this.provider.chainId.toString()] }; // chaiID must be a string
+    this.abis = abis || ABIS;
+    this.ipfs = new IPFS(ipfsConfig);
     this.contracts = {};
-    this.ipfs = new IPFS();
   }
 
   init(names) {
@@ -50,11 +51,7 @@ class Kredits {
 
   static setup(provider, signer, ipfsConfig = null) {
     console.log('Kredits.setup() is deprecated use new Kredits().init() instead');
-    let ipfs = new IPFS(ipfsConfig);
-    return new Kredits(provider, signer).init().then((kredits) => {
-      kredits.ipfs = ipfs;
-      return kredits;
-    });
+    return new Kredits(provider, signer, { ipfsConfig: ipfsConfig }).init();
   }
 
   get Registry() {
diff --git a/lib/utils/ipfs.js b/lib/utils/ipfs.js
index 3c53ce0..4a6606d 100644
--- a/lib/utils/ipfs.js
+++ b/lib/utils/ipfs.js
@@ -5,7 +5,7 @@ class IPFS {
 
   constructor(config) {
     if (!config) {
-      config = {host: 'localhost', port: '5001', protocol: 'http'};
+      config = { host: 'localhost', port: '5001', protocol: 'http' };
     }
     this._ipfsAPI = ipfsAPI(config);
     this._config = config;