diff --git a/.gitignore b/.gitignore
index 5b1fd197..907c78a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,4 +27,3 @@ build/Release
 node_modules
 
 dist
-lib
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index 86772325..b78922d6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,17 @@
 sudo: false
 language: node_js
-node_js:
-  - 4
-  - 5
-  - stable
 
-# Make sure we have new NPM.
+matrix:
+  include:
+  - node_js: 4
+    env: CXX=g++-4.8
+  - node_js: 6
+    env:
+      - SAUCE=true
+      - CXX=g++-4.8
+  - node_js: stable
+    env: CXX=g++-4.8
+
 before_install:
   - npm install -g npm
 
@@ -21,11 +27,8 @@ before_script:
 after_success:
   - npm run coverage-publish
 
-env:
-  - CXX=g++-4.8
-
 addons:
-  firefox: 'latest'
+  firefox: latest
   apt:
     sources:
       - ubuntu-toolchain-r-test
diff --git a/README.md b/README.md
index c5b7c1d5..c1e994ed 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,10 @@
 [![Travis CI](https://travis-ci.org/multiformats/js-multihashing-async.svg?branch=master)](https://travis-ci.org/multiformats/js-multihashing-async)
 [![Circle CI](https://circleci.com/gh/multiformats/js-multihashing-async.svg?style=svg)](https://circleci.com/gh/multiformats/js-multihashing-async)
 [![Dependency Status](https://david-dm.org/multiformats/js-multihashing-async.svg?style=flat-square)](https://david-dm.org/multiformats/js-multihashing-async) [![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square)](https://github.com/feross/standard)
+![](https://img.shields.io/badge/npm-%3E%3D3.0.0-orange.svg?style=flat-square)
+![](https://img.shields.io/badge/Node.js-%3E%3D4.0.0-orange.svg?style=flat-square)
+
+[![Sauce Test Status](https://saucelabs.com/browser-matrix/ipfs-js-mh-async.svg)](https://saucelabs.com/u/ipfs-js-mh-async)
 
 > Use all the functions in [multihash](https://github.com/multiformats/multihash).
 
diff --git a/package.json b/package.json
index 92bafcbe..07954bfb 100644
--- a/package.json
+++ b/package.json
@@ -2,20 +2,18 @@
   "name": "multihashing-async",
   "version": "0.1.0",
   "description": "multiple hash functions",
-  "main": "lib/index.js",
-  "jsnext:main": "src/index.js",
+  "main": "src/index.js",
   "browser": {
-    "./src/crypto.js": "./src/crypto-browser.js",
-    "./lib/crypto.js": "./lib/crypto-browser.js"
+    "./src/crypto.js": "./src/crypto-browser.js"
   },
   "scripts": {
-    "test": "PHANTOM=off aegir-test",
-    "test:browser": "PHANTOM=off aegir-test browser",
+    "test": "aegir-test",
+    "test:browser": "aegir-test browser",
     "test:node": "aegir-test node",
     "lint": "aegir-lint",
-    "release": "PHANTOM=off aegir-release",
-    "release-minor": "PHANTOM=off aegir-release minor",
-    "release-major": "PHANTOM=off aegir-release major",
+    "release": "aegir-release",
+    "release-minor": "aegir-release minor",
+    "release-major": "aegir-release major",
     "build": "aegir-build",
     "coverage": "aegir-coverage",
     "coverage-publish": "aegir-coverage publish",
@@ -39,14 +37,18 @@
   },
   "dependencies": {
     "browserify-sha3": "0.0.2",
-    "multihashes": "^0.2.0",
+    "multihashes": "^0.2.2",
+    "nodeify": "^1.0.0",
     "sha3": "^1.2.0"
   },
   "devDependencies": {
-    "aegir": "^8.1.0",
-    "benchmark": "^2.1.1",
+    "aegir": "^9.0.1",
+    "benchmark": "^2.1.2",
     "chai": "^3.5.0",
-    "pre-commit": "^1.1.2"
+    "pre-commit": "^1.1.3"
+  },
+  "engines": {
+    "node": ">=4.0.0"
   },
   "homepage": "https://github.com/multiformats/js-multihashing-async",
   "contributors": [
@@ -58,4 +60,4 @@
     "Richard Littauer <richard.littauer@gmail.com>",
     "npm-to-cdn-bot (by Forbes Lindesay) <npmcdn-to-unpkg-bot@users.noreply.github.com>"
   ]
-}
\ No newline at end of file
+}
diff --git a/src/crypto-browser.js b/src/crypto-browser.js
index 582f23ed..9035e8ba 100644
--- a/src/crypto-browser.js
+++ b/src/crypto-browser.js
@@ -1,6 +1,7 @@
 'use strict'
 
 const SHA3 = require('browserify-sha3')
+const nodeify = require('nodeify')
 
 const webCrypto = getWebCrypto()
 
@@ -34,9 +35,10 @@ function webCryptoHash (type) {
       return
     }
 
-    return res.then((arrbuf) => {
-      callback(null, new Buffer(new Uint8Array(arrbuf)))
-    }).catch((err) => callback(err))
+    nodeify(
+      res.then((raw) => new Buffer(new Uint8Array(raw))),
+      callback
+    )
   }
 }