Merge branch 'master' into master

diff --cc src/js/bitcoinjs-extensions.js
index 21a535acc4577bcba28f02562cdb567e39fa5fb5,3d0c6bd5fc8d4c375c791067fd5f49f19fd5619e..b37f58f5255302fb4bd4f2a199cc4fec58116fe3
--- 1/src/js/bitcoinjs-extensions.js
--- 2/src/js/bitcoinjs-extensions.js
+++ b/src/js/bitcoinjs-extensions.js
@@@ -1616,13 -1616,13 +1616,25 @@@ bitcoinjs.bitcoin.networks.deeponion = 
      wif: 0x9F,
  };
  
++
 +bitcoinjs.bitcoin.networks.cpuchain = {
 +    messagePrefix: 'x18CPUchain Signed Message:\n',
 +    bip32: {
 +      public: 0x0488B21E,
 +      private: 0x0488ADE4,
 +    },
 +    pubKeyHash: 0x1C,
 +    scriptHash: 0x1E,
 +    wif: 0x80,
 +};
++
+ bitcoinjs.bitcoin.networks.wagerr = {
+   messagePrefix: 'unused',
+   bip32: {
+     public: 0x022d2533,
+     private: 0x0221312b
+   },
+   pubKeyHash: 0x49,
+   scriptHash: 0x3f,
+   wif: 0xc7
+ };

diff --cc src/js/index.js
Simple merge

diff --cc tests/spec/tests.js
Simple merge