diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb5cfa3cf9..90dc035eae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,25 @@
+## [4.0.1](https://github.com/aeternity/aepp-sdk-js/compare/2.4.0...4.0.1) (2019-06-13)
+
+
+### Bug Fixes
+
+* **RPC:** Add contract contractDecodeCallResultAPI to RPC ([#482](https://github.com/aeternity/aepp-sdk-js/issues/482)) ([7eb6bd8](https://github.com/aeternity/aepp-sdk-js/commit/7eb6bd8))
+* **README:** Fix flavor link ([#480](https://github.com/aeternity/aepp-sdk-js/pull/480))
+
+### Code Refactoring
+
+* **Compiler:** Fix compiler compatibility mechanism ([#479](https://github.com/aeternity/aepp-sdk-js/issues/479)) ([78cc990](https://github.com/aeternity/aepp-sdk-js/commit/78cc990))
+* **Utils:** Move json-bigint implementation to `utils` ([#486](https://github.com/aeternity/aepp-sdk-js/issues/486)) ([1538867](https://github.com/aeternity/aepp-sdk-js/commit/1538867))
+
+### Build
+
+* **webpack:** Add another bundle(`dist/aepp-sdk.browser-script.js`) for using in `<script>` tag ([#485](https://github.com/aeternity/aepp-sdk-js/pull/485))
+
+
+
 # [4.0.0](https://github.com/aeternity/aepp-sdk-js/compare/3.4.1...4.0.0) (2019-06-12)
 
+
 ### Bug Fixes
 
 * **Ae:** Fix exception when it used without Contract stamp
diff --git a/README.md b/README.md
index 7d8624cd56..6203327240 100644
--- a/README.md
+++ b/README.md
@@ -58,7 +58,7 @@ npm i https://github.com/aeternity/aepp-sdk-js#develop
 
 ### 2. Import (a chosen Flavor)
 
-Import the right [flavor](docs/usage.md). For this example with get the `Universal` flavor, which contains all the features of the SDK:
+Import the right [flavor](docs/README.md#flavors--entry-points). For this example with get the `Universal` flavor, which contains all the features of the SDK:
 
 ```js
 import Ae from '@aeternity/aepp-sdk/es/ae/universal' // or other flavor
diff --git a/docs/README.md b/docs/README.md
index 4281a32549..1fff7b2abb 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -5,6 +5,7 @@ There are three different ways of incorporating aepp-sdk-js into your project, d
 * ES Modules at `es/` (recommended)
 * Node.js bundle at `dist/aepp-sdk.js`
 * Browser bundle at `dist/aepp-sdk.browser.js`
+* Browser bundle for using through \<script\> tag at `dist/aepp-sdk.browser-script.js`
 
 Also, please be aware that using `require` instead of module loader syntax
 (`import`) means that the default export automatically becomes exposed as
diff --git a/docs/api/contract.md b/docs/api/contract.md
index 0b7bc53cc5..2287affc4c 100644
--- a/docs/api/contract.md
+++ b/docs/api/contract.md
@@ -3,7 +3,6 @@
 ## @aeternity/aepp-sdk/es/contract
 Contract Base module
 
-**Export**: Contract  
 **Example**  
 ```js
 import ContractBase from '@aeternity/aepp-sdk/es/contract'
@@ -13,6 +12,7 @@ import ContractBase from '@aeternity/aepp-sdk/es/contract'
     * [ContractBase([options])](#exp_module_@aeternity/aepp-sdk/es/contract--ContractBase) ⇒ `Object` ⏏
         * *[.contractEncodeCallDataAPI(source, name, args)](#module_@aeternity/aepp-sdk/es/contract--ContractBase+contractEncodeCallDataAPI) ⇒ `String`*
         * *[.contractDecodeDataAPI(type, data)](#module_@aeternity/aepp-sdk/es/contract--ContractBase+contractDecodeDataAPI) ⇒ `String`*
+        * *[.contractDecodeCallResultAPI(source, fn, callValue, callResult)](#module_@aeternity/aepp-sdk/es/contract--ContractBase+contractDecodeCallResultAPI) ⇒ `String`*
         * *[.contractDecodeCallDataBySourceAPI(source, function, callData)](#module_@aeternity/aepp-sdk/es/contract--ContractBase+contractDecodeCallDataBySourceAPI) ⇒ `String`*
         * *[.contractDecodeCallDataByCodeAPI(code, callData)](#module_@aeternity/aepp-sdk/es/contract--ContractBase+contractDecodeCallDataByCodeAPI) ⇒ `String`*
         * *[.compileContractAPI(code, [options])](#module_@aeternity/aepp-sdk/es/contract--ContractBase+compileContractAPI) ⇒ `Object`*
@@ -67,6 +67,23 @@ Decode data
 | type | `String` | Contract call result type |
 | data | `String` | Encoded contract call result |
 
+<a id="module_@aeternity/aepp-sdk/es/contract--ContractBase+contractDecodeCallResultAPI"></a>
+
+#### *contractBase.contractDecodeCallResultAPI(source, fn, callValue, callResult) ⇒ `String`*
+Decode contract call result data
+
+**Kind**: instance abstract method of [`ContractBase`](#exp_module_@aeternity/aepp-sdk/es/contract--ContractBase)  
+**Returns**: `String` - - Decoded contract call result  
+**Category**: async  
+**rtype**: `(source: String, fn: String, callValue: String, callResult: String) => decodedResult: Promise[String]`
+
+| Param | Type | Description |
+| --- | --- | --- |
+| source | `String` | Contract source |
+| fn | `String` | Fn name |
+| callValue | `String` | result data (cb_das...) |
+| callResult | `String` | contract call result status('ok', 'revert', ...) |
+
 <a id="module_@aeternity/aepp-sdk/es/contract--ContractBase+contractDecodeCallDataBySourceAPI"></a>
 
 #### *contractBase.contractDecodeCallDataBySourceAPI(source, function, callData) ⇒ `String`*
diff --git a/docs/guides/import-script-tag.md b/docs/guides/import-script-tag.md
index 939d9588f2..ae4ee3c377 100644
--- a/docs/guides/import-script-tag.md
+++ b/docs/guides/import-script-tag.md
@@ -15,9 +15,9 @@ The bundle will assign the SDK to a global `var` called `Ae`.
   <meta charset="utf-8">
 </head>
 <body>
-  <script src="aepp-sdk.browser.js"></script>
+  <script src="aepp-sdk.browser-script.js"></script>
   <script type="text/javascript">
-    Ae.Wallet.default().then(ae => {
+    Ae.Wallet().then(ae => {
       ae.height().then(height => {
         console.log('Current Block', height)
       })
diff --git a/es/contract/compiler.js b/es/contract/compiler.js
index 6616fd34df..01105a59a4 100644
--- a/es/contract/compiler.js
+++ b/es/contract/compiler.js
@@ -27,6 +27,7 @@
 import Http from '../utils/http'
 import ContractBase from './index'
 import semverSatisfies from '../utils/semver-satisfies'
+import AsyncInit from '../utils/async-init'
 
 async function getCompilerVersion (options = {}) {
   return this.http
@@ -35,43 +36,68 @@ async function getCompilerVersion (options = {}) {
 }
 
 async function contractEncodeCallDataAPI (source, name, args = [], options = {}) {
+  this.isInit()
   return this.http
     .post('/encode-calldata', { source, 'function': name, arguments: args }, options)
     .then(({ calldata }) => calldata)
 }
 
 async function contractDecodeCallDataByCodeAPI (bytecode, calldata, options = {}) {
+  this.isInit()
   return this.http
     .post('/decode-calldata/bytecode', { bytecode, calldata }, options)
 }
 
 async function contractDecodeCallDataBySourceAPI (source, fn, callData, options = {}) {
+  this.isInit()
   return this.http
     .post('/decode-calldata/source', { 'function': fn, source, calldata: callData }, options)
 }
 
 async function contractDecodeCallResultAPI (source, fn, callValue, callResult, options = {}) {
+  this.isInit()
   return this.http
     .post('/decode-call-result', { 'function': fn, source, 'call-result': callResult, 'call-value': callValue }, options)
 }
 
 async function contractDecodeDataAPI (type, data, options = {}) {
+  this.isInit()
   return this.http
     .post('/decode-data', { data, 'sophia-type': type }, options)
     .then(({ data }) => data)
 }
 
 async function compileContractAPI (code, options = {}) {
+  this.isInit()
   return this.http.post('/compile', { code, options }, options)
     .then(({ bytecode }) => bytecode)
 }
 
 async function contractGetACI (code, options = {}) {
+  this.isInit()
   return this.http.post('/aci', { code, options }, options)
 }
 
-function setCompilerUrl (url) {
+async function setCompilerUrl (url) {
   this.http.changeBaseUrl(url)
+  this.compilerVersion = null
+  await this.checkCompatibility()
+}
+
+async function checkCompatibility (force = false) {
+  this.compilerVersion = await this.getCompilerVersion().catch(e => null)
+  if (!this.compilerVersion && !force) throw new Error('Compiler do not respond')
+  if (this.compilerVersion && !semverSatisfies(this.compilerVersion.split('-')[0], COMPILER_GE_VERSION, COMPILER_LT_VERSION)) {
+    const version = this.compilerVersion
+    this.compilerVersion = null
+    throw new Error(`Unsupported compiler version ${version}. ` +
+      `Supported: >= ${COMPILER_GE_VERSION} < ${COMPILER_LT_VERSION}`)
+  }
+}
+
+function isInit () {
+  if (this.compilerVersion === null) throw Error('Compiler not defined')
+  return true
 }
 
 /**
@@ -86,14 +112,10 @@ function setCompilerUrl (url) {
  * @return {Object} Contract compiler instance
  * @example ContractCompilerAPI({ compilerUrl: 'COMPILER_URL' })
  */
-const ContractCompilerAPI = ContractBase.compose({
+const ContractCompilerAPI = AsyncInit.compose(ContractBase, {
   async init ({ compilerUrl = this.compilerUrl }) {
     this.http = Http({ baseUrl: compilerUrl })
-    this.compilerVersion = await this.getCompilerVersion()
-    if (!semverSatisfies(this.compilerVersion.split('-')[0], COMPILER_GE_VERSION, COMPILER_LT_VERSION)) {
-      throw new Error(`Unsupported compiler version ${this.compilerVersion}. ` +
-        `Supported: >= ${COMPILER_GE_VERSION} < ${COMPILER_LT_VERSION}`)
-    }
+    await this.checkCompatibility(true)
   },
   methods: {
     contractEncodeCallDataAPI,
@@ -104,7 +126,9 @@ const ContractCompilerAPI = ContractBase.compose({
     contractDecodeCallDataBySourceAPI,
     contractDecodeCallResultAPI,
     setCompilerUrl,
-    getCompilerVersion
+    getCompilerVersion,
+    isInit,
+    checkCompatibility
   },
   props: {
     compilerVersion: null
diff --git a/es/contract/index.js b/es/contract/index.js
index 029b545a86..f3afe20d9c 100644
--- a/es/contract/index.js
+++ b/es/contract/index.js
@@ -48,7 +48,8 @@ const ContractBase = stampit({
         'contractDecodeCallDataByCodeAPI',
         'contractGetACI',
         'setCompilerUrl',
-        'getCompilerVersion'
+        'getCompilerVersion',
+        'contractDecodeCallResultAPI'
       ]
     }
   }
@@ -59,7 +60,8 @@ const ContractBase = stampit({
     compileContractAPI: required,
     contractGetACI: required,
     setCompilerUrl: required,
-    getCompilerVersion: required
+    getCompilerVersion: required,
+    contractDecodeCallResultAPI: required
   }
 }))
 
@@ -88,6 +90,20 @@ const ContractBase = stampit({
  * @return {String} - Decoded contract call result
  */
 
+/**
+ * Decode contract call result data
+ * @function contractDecodeCallResultAPI
+ * @instance
+ * @abstract
+ * @category async
+ * @rtype (source: String, fn: String, callValue: String, callResult: String) => decodedResult: Promise[String]
+ * @param {String} source - Contract source
+ * @param {String} fn - Fn name
+ * @param {String} callValue - result data (cb_das...)
+ * @param {String} callResult - contract call result status('ok', 'revert', ...)
+ * @return {String} - Decoded contract call result
+ */
+
 /**
  * Decode call data by source
  * @function contractDecodeCallDataBySourceAPI
diff --git a/es/node.js b/es/node.js
index 50a1867f19..5628d46c27 100644
--- a/es/node.js
+++ b/es/node.js
@@ -102,6 +102,7 @@ function axiosError (handler) {
  */
 const Node = stampit({
   async init ({ url = this.url, internalUrl = this.internalUrl, axiosConfig: { config, errorHandler } = {} }) {
+    if (!url || !internalUrl) throw new Error('"url" and "internalUrl" required')
     url = url.replace(/\/?$/, '')
     internalUrl = internalUrl.replace(/\/?$/, '')
     // Get swagger schema
diff --git a/es/utils/http.js b/es/utils/http.js
index b3e75dbab7..eefdd61e0c 100644
--- a/es/utils/http.js
+++ b/es/utils/http.js
@@ -1,5 +1,5 @@
 import axios from 'axios'
-import JSONbig from 'json-bigint'
+import JsonBig from './json-big'
 import * as R from 'ramda'
 import stampit from '@stamp/it'
 
@@ -59,7 +59,7 @@ const Http = stampit({
       headers: { 'Content-Type': 'application/json' },
       transformResponse: [(data) => {
         try {
-          return JSONbig({ 'storeAsString': true }).parse(data)
+          return JsonBig.parse(data)
         } catch (e) {
           return data
         }
diff --git a/es/utils/json-big.js b/es/utils/json-big.js
new file mode 100644
index 0000000000..41440e630c
--- /dev/null
+++ b/es/utils/json-big.js
@@ -0,0 +1,317 @@
+/* eslint-disable */
+export default {
+  parse: ((options) => {
+    // This is a function that can parse a JSON text, producing a JavaScript
+    // data structure. It is a simple, recursive descent parser. It does not use
+    // eval or regular expressions, so it can be used as a model for implementing
+    // a JSON parser in other languages.
+
+    // We are defining the function inside of another function to avoid creating
+    // global letiables.
+
+    // Default options one can override by passing options to the parse()
+    const _options = {
+      'strict': false, // not being strict means do not generate syntax errors for "duplicate key"
+      'storeAsString': false // toggles whether the values should be stored as BigNumber (default) or a string
+    }
+
+    const escapee = {
+      '"': '"',
+      '\\': '\\',
+      '/': '/',
+      b: '\b',
+      f: '\f',
+      n: '\n',
+      r: '\r',
+      t: '\t'
+    }
+
+    // If there are options, then use them to override the default _options
+    if (options !== undefined && options !== null) {
+      if (options.strict === true) {
+        _options.strict = true
+      }
+      if (options.storeAsString === true) {
+        _options.storeAsString = true
+      }
+    }
+
+    let at
+    // The index of the current character
+
+    let ch
+    // The current character
+
+    let text
+
+    let error = function (m) {
+      // Call error when something is wrong.
+
+      throw {
+        name: 'SyntaxError',
+        message: m,
+        at: at,
+        text: text
+      }
+    }
+
+    let next = function (c) {
+      // If a c parameter is provided, verify that it matches the current character.
+
+      if (c && c !== ch) {
+        error('Expected \'' + c + '\' instead of \'' + ch + '\'')
+      }
+
+      // Get the next character. When there are no more characters,
+      // return the empty string.
+
+      ch = text.charAt(at)
+      at += 1
+      return ch
+    }
+
+    let number = function () {
+      // Parse a number value.
+
+      let number
+
+      let string = ''
+
+      if (ch === '-') {
+        string = '-'
+        next('-')
+      }
+      while (ch >= '0' && ch <= '9') {
+        string += ch
+        next()
+      }
+      if (ch === '.') {
+        string += '.'
+        while (next() && ch >= '0' && ch <= '9') {
+          string += ch
+        }
+      }
+      if (ch === 'e' || ch === 'E') {
+        string += ch
+        next()
+        if (ch === '-' || ch === '+') {
+          string += ch
+          next()
+        }
+        while (ch >= '0' && ch <= '9') {
+          string += ch
+          next()
+        }
+      }
+      number = +string
+      if (!isFinite(number)) {
+        error('Bad number')
+      } else {
+        // if (number > 9007199254740992 || number < -9007199254740992)
+        // Bignumber has stricter check: everything with length > 15 digits disallowed
+        if (string.length > 15) { return string }
+        return number
+      }
+    }
+
+    let string = function () {
+      // Parse a string value.
+
+      let hex
+
+      let i
+
+      let string = ''
+
+      let uffff
+
+      // When parsing for string values, we must look for " and \ characters.
+
+      if (ch === '"') {
+        while (next()) {
+          if (ch === '"') {
+            next()
+            return string
+          }
+          if (ch === '\\') {
+            next()
+            if (ch === 'u') {
+              uffff = 0
+              for (i = 0; i < 4; i += 1) {
+                hex = parseInt(next(), 16)
+                if (!isFinite(hex)) {
+                  break
+                }
+                uffff = uffff * 16 + hex
+              }
+              string += String.fromCharCode(uffff)
+            } else if (typeof escapee[ch] === 'string') {
+              string += escapee[ch]
+            } else {
+              break
+            }
+          } else {
+            string += ch
+          }
+        }
+      }
+      error('Bad string')
+    }
+
+    let white = function () {
+      // Skip whitespace.
+
+      while (ch && ch <= ' ') {
+        next()
+      }
+    }
+
+    let word = function () {
+      // true, false, or null.
+
+      switch (ch) {
+        case 't':
+          next('t')
+          next('r')
+          next('u')
+          next('e')
+          return true
+        case 'f':
+          next('f')
+          next('a')
+          next('l')
+          next('s')
+          next('e')
+          return false
+        case 'n':
+          next('n')
+          next('u')
+          next('l')
+          next('l')
+          return null
+      }
+      error('Unexpected \'' + ch + '\'')
+    }
+
+    let value
+    // Place holder for the value function.
+
+    let array = function () {
+      // Parse an array value.
+
+      let array = []
+
+      if (ch === '[') {
+        next('[')
+        white()
+        if (ch === ']') {
+          next(']')
+          return array // empty array
+        }
+        while (ch) {
+          array.push(value())
+          white()
+          if (ch === ']') {
+            next(']')
+            return array
+          }
+          next(',')
+          white()
+        }
+      }
+      error('Bad array')
+    }
+
+    let object = function () {
+      // Parse an object value.
+
+      let key
+
+      let object = {}
+
+      if (ch === '{') {
+        next('{')
+        white()
+        if (ch === '}') {
+          next('}')
+          return object // empty object
+        }
+        while (ch) {
+          key = string()
+          white()
+          next(':')
+          if (_options.strict === true && Object.hasOwnProperty.call(object, key)) {
+            error('Duplicate key "' + key + '"')
+          }
+          object[key] = value()
+          white()
+          if (ch === '}') {
+            next('}')
+            return object
+          }
+          next(',')
+          white()
+        }
+      }
+      error('Bad object')
+    }
+
+    value = function () {
+      // Parse a JSON value. It could be an object, an array, a string, a number,
+      // or a word.
+
+      white()
+      switch (ch) {
+        case '{':
+          return object()
+        case '[':
+          return array()
+        case '"':
+          return string()
+        case '-':
+          return number()
+        default:
+          return ch >= '0' && ch <= '9' ? number() : word()
+      }
+    }
+
+    // Return the json_parse function. It will have access to all of the above
+    // functions and letiables.
+
+    return function (source, reviver) {
+      let result
+
+      text = source + ''
+      at = 0
+      ch = ' '
+      result = value()
+      white()
+      if (ch) {
+        error('Syntax error')
+      }
+
+      // If there is a reviver function, we recursively walk the new structure,
+      // passing each name/value pair to the reviver function for possible
+      // transformation, starting with a temporary root object that holds the result
+      // in an empty key. If there is not a reviver function, we simply return the
+      // result.
+
+      return typeof reviver === 'function'
+        ? (function walk (holder, key) {
+          let k; let v; let value = holder[key]
+          if (value && typeof value === 'object') {
+            Object.keys(value).forEach(function (k) {
+              v = walk(value, k)
+              if (v !== undefined) {
+                value[k] = v
+              } else {
+                delete value[k]
+              }
+            })
+          }
+          return reviver.call(holder, key, value)
+        }({ '': result }, ''))
+        : result
+    }
+  })()
+}
diff --git a/es/utils/swagger.js b/es/utils/swagger.js
index 968b59b161..8914a9efdf 100644
--- a/es/utils/swagger.js
+++ b/es/utils/swagger.js
@@ -22,7 +22,7 @@
  * @example import Swagger from '@aeternity/aepp-sdk/es/utils/swagger'
  */
 
-import JSONbig from 'json-bigint'
+import JsonBig from './json-big'
 import stampit from '@stamp/it'
 import AsyncInit from './async-init'
 import axios from 'axios'
@@ -194,7 +194,7 @@ const httpConfig = {
   headers: { 'Content-Type': 'application/json' },
   transformResponse: [(data) => {
     try {
-      return JSONbig({ 'storeAsString': true }).parse(data)
+      return JsonBig.parse(data)
     } catch (e) {
       return data
     }
diff --git a/package-lock.json b/package-lock.json
index 360fa4de08..fe0bc0e6c8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "@aeternity/aepp-sdk",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -6504,13 +6504,6 @@
       "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
       "dev": true
     },
-    "json-bigint": {
-      "version": "github:davidyuk/json-bigint#64b099a5d8e9d1210175db0a13cfd7ab0c66d85a",
-      "from": "github:davidyuk/json-bigint",
-      "requires": {
-        "bignumber.js": "^8.0.0"
-      }
-    },
     "json-parse-better-errors": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
diff --git a/package.json b/package.json
index f55a92875f..8b8fabe9c6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@aeternity/aepp-sdk",
-  "version": "4.0.0",
+  "version": "4.0.1",
   "description": "SDK for the æternity blockchain",
   "main": "dist/aepp-sdk.js",
   "browser": "dist/aepp-sdk.browser.js",
@@ -39,7 +39,6 @@
     "bs58check": "^2.1.1",
     "commander": "^2.14.1",
     "joi-browser": "^13.4.0",
-    "json-bigint": "davidyuk/json-bigint",
     "libsodium-wrappers-sumo": "0.7.3",
     "ramda": "^0.25.0",
     "rlp": "2.1.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9896255690..b52827fb1d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -12,7 +12,6 @@ dependencies:
   bs58check: 2.1.2
   commander: 2.20.0
   joi-browser: 13.4.0
-  json-bigint: github.com/davidyuk/json-bigint/64b099a5d8e9d1210175db0a13cfd7ab0c66d85a
   libsodium-wrappers-sumo: 0.7.3
   ramda: 0.25.0
   rlp: 2.1.0
@@ -32,7 +31,7 @@ devDependencies:
   '@babel/preset-env': 7.4.5_@babel+core@7.4.5
   '@babel/register': 7.4.4_@babel+core@7.4.5
   babel-core: 6.26.3
-  babel-loader: 8.0.6_@babel+core@7.4.5+webpack@4.33.0
+  babel-loader: 8.0.6_@babel+core@7.4.5+webpack@4.34.0
   babel-plugin-ramda: 1.6.3
   bufferutil: 3.0.5
   chai: 4.2.0
@@ -62,9 +61,9 @@ devDependencies:
   standard-loader: 6.0.1_standard@12.0.1
   supports-color: 5.5.0
   uglify-es: 3.3.9
-  webpack: 4.33.0_webpack@4.33.0
+  webpack: 4.34.0_webpack@4.34.0
   webpack-bundle-analyzer: 3.3.2
-  webpack-cli: 3.3.4_webpack@4.33.0
+  webpack-cli: 3.3.4_webpack@4.34.0
   worker-farm: 1.7.0
 lockfileVersion: 5.1
 packages:
@@ -1450,14 +1449,14 @@ packages:
     dev: true
     resolution:
       integrity: sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=
-  /babel-loader/8.0.6_@babel+core@7.4.5+webpack@4.33.0:
+  /babel-loader/8.0.6_@babel+core@7.4.5+webpack@4.34.0:
     dependencies:
       '@babel/core': 7.4.5
       find-cache-dir: 2.1.0
       loader-utils: 1.2.3
       mkdirp: 0.5.1
       pify: 4.0.1
-      webpack: 4.33.0_webpack@4.33.0
+      webpack: 4.34.0_webpack@4.34.0
     dev: true
     engines:
       node: '>= 6.9'
@@ -1738,7 +1737,7 @@ packages:
   /browserslist/4.6.2:
     dependencies:
       caniuse-lite: 1.0.30000974
-      electron-to-chromium: 1.3.157
+      electron-to-chromium: 1.3.158
       node-releases: 1.1.23
     dev: true
     hasBin: true
@@ -2747,10 +2746,10 @@ packages:
       node: '>=0.10.0'
     resolution:
       integrity: sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ==
-  /electron-to-chromium/1.3.157:
+  /electron-to-chromium/1.3.158:
     dev: true
     resolution:
-      integrity: sha512-vxGi3lOGqlupuogZxJOMfu+Q1vaOlG6XbsblWw8XnUZSr/ptbt3D6jhHT5LJPZuFUpKhbEo1u4QipivSory1Kg==
+      integrity: sha512-wJsJaWsViNQ129XPGmyO5gGs1jPMHr9vffjHAhUje1xZbEzQcqbENdvfyRD9q8UF0TgFQFCCUbaIpJarFbvsIg==
   /elliptic/6.4.1:
     dependencies:
       bn.js: 4.11.8
@@ -4255,10 +4254,6 @@ packages:
       node: '>=0.8.19'
     resolution:
       integrity: sha1-khi5srkoojixPcT7a21XbyMUU+o=
-  /indexof/0.0.1:
-    dev: true
-    resolution:
-      integrity: sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
   /inflight/1.0.6:
     dependencies:
       once: 1.4.0
@@ -4698,7 +4693,7 @@ packages:
       parse5: 1.5.1
       request: 2.88.0
       sax: 1.2.4
-      symbol-tree: 3.2.2
+      symbol-tree: 3.2.4
       tough-cookie: 2.5.0
       webidl-conversions: 2.0.1
       whatwg-url-compat: 0.6.5
@@ -5407,7 +5402,7 @@ packages:
     dev: true
     resolution:
       integrity: sha512-VNYPRfGfmZLx0Ye20jWzHUjyTW/c+6Wq+iLhDzUI4XmhrDd9l/FozXV3F2xOaXjvp0co0+v1YSR3CMP6g+VvLQ==
-  /node-libs-browser/2.2.0:
+  /node-libs-browser/2.2.1:
     dependencies:
       assert: 1.5.0
       browserify-zlib: 0.2.0
@@ -5419,7 +5414,7 @@ packages:
       events: 3.0.0
       https-browserify: 1.0.0
       os-browserify: 0.3.0
-      path-browserify: 0.0.0
+      path-browserify: 0.0.1
       process: 0.11.10
       punycode: 1.4.1
       querystring-es3: 0.2.1
@@ -5431,10 +5426,10 @@ packages:
       tty-browserify: 0.0.0
       url: 0.11.0
       util: 0.11.1
-      vm-browserify: 0.0.4
+      vm-browserify: 1.1.0
     dev: true
     resolution:
-      integrity: sha512-5MQunG/oyOaBdttrL40dA7bUfPORLRWMUJLQtMg7nluxUvk5XwnLdL9twQHFAjRx/y7mIMkLKT9++qPbbk6BZA==
+      integrity: sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==
   /node-modules-regexp/1.0.0:
     dev: true
     engines:
@@ -5799,10 +5794,10 @@ packages:
       node: '>=0.10.0'
     resolution:
       integrity: sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
-  /path-browserify/0.0.0:
+  /path-browserify/0.0.1:
     dev: true
     resolution:
-      integrity: sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=
+      integrity: sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==
   /path-dirname/1.0.2:
     dev: true
     resolution:
@@ -7115,11 +7110,11 @@ packages:
       node: '>=0.10.0'
     resolution:
       integrity: sha1-g0D8RwLDEi310iKI+IKD9RPT/dQ=
-  /symbol-tree/3.2.2:
+  /symbol-tree/3.2.4:
     dev: true
     optional: true
     resolution:
-      integrity: sha1-rifbOPZgp64uHDt9G8KQgZuFGeY=
+      integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
   /table-layout/0.4.4:
     dependencies:
       array-back: 2.0.0
@@ -7201,7 +7196,7 @@ packages:
     dev: true
     resolution:
       integrity: sha1-JLFUOXOrRCiW2a02fdnL2/r+kYs=
-  /terser-webpack-plugin/1.3.0_webpack@4.33.0:
+  /terser-webpack-plugin/1.3.0_webpack@4.34.0:
     dependencies:
       cacache: 11.3.2
       find-cache-dir: 2.1.0
@@ -7211,7 +7206,7 @@ packages:
       serialize-javascript: 1.7.0
       source-map: 0.6.1
       terser: 4.0.0
-      webpack: 4.33.0_webpack@4.33.0
+      webpack: 4.34.0_webpack@4.34.0
       webpack-sources: 1.3.0
       worker-farm: 1.7.0
     dev: true
@@ -7646,12 +7641,10 @@ packages:
     optional: true
     resolution:
       integrity: sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=
-  /vm-browserify/0.0.4:
-    dependencies:
-      indexof: 0.0.1
+  /vm-browserify/1.1.0:
     dev: true
     resolution:
-      integrity: sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=
+      integrity: sha512-iq+S7vZJE60yejDYM0ek6zg308+UZsdtPExWP9VZoCFCz1zkJoXFnAX7aZfd/ZwrkidzdUZL0C/ryW+JwAiIGw==
   /walk-back/2.0.1:
     dev: true
     engines:
@@ -7698,7 +7691,7 @@ packages:
     hasBin: true
     resolution:
       integrity: sha512-7qvJLPKB4rRWZGjVp5U1KEjwutbDHSKboAl0IfafnrdXMrgC0tOtZbQD6Rw0u4cmpgRN4O02Fc0t8eAT+FgGzA==
-  /webpack-cli/3.3.4_webpack@4.33.0:
+  /webpack-cli/3.3.4_webpack@4.34.0:
     dependencies:
       chalk: 2.4.2
       cross-spawn: 6.0.5
@@ -7711,7 +7704,7 @@ packages:
       prettier: 1.18.2
       supports-color: 5.5.0
       v8-compile-cache: 2.0.3
-      webpack: 4.33.0_webpack@4.33.0
+      webpack: 4.34.0_webpack@4.34.0
       yargs: 12.0.5
     dev: true
     engines:
@@ -7729,7 +7722,7 @@ packages:
     dev: true
     resolution:
       integrity: sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==
-  /webpack/4.33.0_webpack@4.33.0:
+  /webpack/4.34.0_webpack@4.34.0:
     dependencies:
       '@webassemblyjs/ast': 1.8.5
       '@webassemblyjs/helper-module-context': 1.8.5
@@ -7749,10 +7742,10 @@ packages:
       micromatch: 3.1.10
       mkdirp: 0.5.1
       neo-async: 2.6.1
-      node-libs-browser: 2.2.0
+      node-libs-browser: 2.2.1
       schema-utils: 1.0.0
       tapable: 1.1.3
-      terser-webpack-plugin: 1.3.0_webpack@4.33.0
+      terser-webpack-plugin: 1.3.0_webpack@4.34.0
       watchpack: 1.6.0
       webpack-sources: 1.3.0
     dev: true
@@ -7762,7 +7755,7 @@ packages:
     peerDependencies:
       webpack: '*'
     resolution:
-      integrity: sha512-ggWMb0B2QUuYso6FPZKUohOgfm+Z0sVFs8WwWuSH1IAvkWs428VDNmOlAxvHGTB9Dm/qOB/qtE5cRx5y01clxw==
+      integrity: sha512-ry2IQy1wJjOefLe1uJLzn5tG/DdIKzQqNlIAd2L84kcaADqNvQDTBlo8UcCNyDaT5FiaB+16jhAkb63YeG3H8Q==
   /websocket/1.0.28:
     dependencies:
       debug: 2.6.9
@@ -7926,15 +7919,6 @@ packages:
     dev: true
     resolution:
       integrity: sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==
-  github.com/davidyuk/json-bigint/64b099a5d8e9d1210175db0a13cfd7ab0c66d85a:
-    dependencies:
-      bignumber.js: 8.1.1
-    dev: false
-    name: json-bigint
-    resolution:
-      registry: 'https://registry.npmjs.org/'
-      tarball: 'https://codeload.github.com/davidyuk/json-bigint/tar.gz/64b099a5d8e9d1210175db0a13cfd7ab0c66d85a'
-    version: 0.3.0
 specifiers:
   '@aeternity/bip39': ^0.1.0
   '@babel/cli': ^7.0.0-beta.46
@@ -7978,7 +7962,6 @@ specifiers:
   find-cache-dir: ^2.0.0
   joi-browser: ^13.4.0
   jsdoc-to-markdown: ^5.0.0
-  json-bigint: davidyuk/json-bigint
   libsodium-wrappers-sumo: 0.7.3
   mocha: ^5.0.0
   mocha-junit-reporter: ^1.17.0
diff --git a/test/integration/contract.js b/test/integration/contract.js
index 283b29b4cb..21fa57da1b 100644
--- a/test/integration/contract.js
+++ b/test/integration/contract.js
@@ -149,6 +149,14 @@ describe('Contract', function () {
     it('decode call-data', async () => {
       return contract.contractDecodeCallResultAPI(identityContract, 'main', encodedNumberSix, 'ok').should.eventually.become(6)
     })
+    it('Use invalid compiler url', async () => {
+      try {
+        const cloned = R.clone(contract)
+        await cloned.setCompilerUrl('https://compiler.aepps.comas')
+      } catch (e) {
+        e.message.should.be.equal('Compiler do not respond')
+      }
+    })
   })
 
   describe('Contract ACI Interface', function () {
diff --git a/webpack.config.js b/webpack.config.js
index a7dbe90ecd..72129c4998 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -3,7 +3,7 @@ const R = require('ramda')
 const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin
 
 function configure (filename, opts = {}) {
-  return (env, argv) => R.mergeDeepLeft({
+  return (env, argv) => R.mergeDeepRight({
     entry: './es/index.js',
     mode: 'development', // automatically overriden by production flag
     devtool: argv.mode === 'production' ? 'source-map' : 'eval-source-map',
@@ -52,5 +52,6 @@ function configure (filename, opts = {}) {
 
 module.exports = [
   configure('aepp-sdk.js', { target: 'node' }),
-  configure('aepp-sdk.browser.js')
+  configure('aepp-sdk.browser.js'),
+  configure('aepp-sdk.browser-script.js', { externals: undefined })
 ]