diff --git a/emscripten/package.json b/emscripten/package.json
index 9b822bbfd..16ad3c5ce 100644
--- a/emscripten/package.json
+++ b/emscripten/package.json
@@ -3,6 +3,6 @@
   "version": "1.0.0",
   "description": "",
   "dependencies": {
-    "bitcoinjs-lib": "^1.5.7"
+    "bitcoinjs-lib": "^2.1.1"
   }
 }
diff --git a/emscripten/post.js b/emscripten/post.js
index 638121abc..c42c941c1 100644
--- a/emscripten/post.js
+++ b/emscripten/post.js
@@ -28,7 +28,7 @@ var _address = _malloc(ADDRESS_SIZE);
  */
 
 /**
- * @param {HDNode} node HDNode struct, see the definition above
+ * @param {HDNode} node  HDNode struct, see the definition above
  * @return {Uint8Array}
  */
 function serializeNode(node) {
@@ -47,9 +47,9 @@ function serializeNode(node) {
 }
 
 /**
- * @param {Uint8Array} sn serialized node, see `serializeNode`
- * @param {Number} index BIP32 index of the address
- * @param {Number} version address version byte
+ * @param {Uint8Array} sn   serialized node, see `serializeNode`
+ * @param {Number} index    BIP32 index of the address
+ * @param {Number} version  address version byte
  * @return {String}
  */
 function deriveAddress(sn, index, version) {
@@ -60,17 +60,17 @@ function deriveAddress(sn, index, version) {
 }
 
 /**
- * @param {HDNode} node HDNode struct, see the definition above
- * @param {Number} from index of the first address
- * @param {Number} to index of the last address
- * @param {Number} version address version byte
+ * @param {HDNode} node        HDNode struct, see the definition above
+ * @param {Number} firstIndex  index of the first address
+ * @param {Number} lastIndex   index of the last address
+ * @param {Number} version     address version byte
  * @return {Array<String>}
  */
-function deriveAddressRange(node, from, to, version) {
+function deriveAddressRange(node, firstIndex, lastIndex, version) {
     var addresses = [];
     var sn = serializeNode(node);
     var i;
-    for (i = from; i <= to; i++) {
+    for (i = firstIndex; i <= lastIndex; i++) {
         addresses.push(deriveAddress(sn, i, version));
     }
     return addresses;
@@ -94,13 +94,17 @@ function processMessage(event) {
 
     switch (type) {
     case 'deriveAddressRange':
-        var response = deriveAddressRange(
+        var addresses = deriveAddressRange(
             data['node'],
-            data['from'],
-            data['to'],
+            data['firstIndex'],
+            data['lastIndex'],
             data['version']
         );
-        postMessage(response);
+        postMessage({
+            'addresses': addresses,
+            'firstIndex': data['firstIndex'],
+            'lastIndex': data['lastIndex']
+        });
         break;
 
     default:
diff --git a/emscripten/test.js b/emscripten/test.js
index 31d58f2c3..b0a6d1bea 100644
--- a/emscripten/test.js
+++ b/emscripten/test.js
@@ -11,7 +11,7 @@ var nodeStruct = {
     child_num: node.index,
     fingerprint: node.parentFingerprint,
     chain_code: node.chainCode,
-    public_key: node.pubKey.toBuffer()
+    public_key: node.keyPair.getPublicKeyBuffer().toString('hex')
 };
 var nodeSerialized = crypto.serializeNode(nodeStruct);