diff --git a/.gitignore b/.gitignore
index 907c78a..6b9f154 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@ build/Release
 node_modules
 
 dist
+docs
\ No newline at end of file
diff --git a/.npmignore b/.npmignore
index 00a160d..94581de 100644
--- a/.npmignore
+++ b/.npmignore
@@ -27,3 +27,4 @@ build/Release
 node_modules
 
 test
+docs
\ No newline at end of file
diff --git a/README.md b/README.md
index f386b76..b7999cc 100644
--- a/README.md
+++ b/README.md
@@ -102,7 +102,7 @@ the global namespace.
 ### Attach multistream to a connection (socket)
 
 ```JavaScript
-const Multistream = require('multistream-select')
+const multistream = require('multistream-select')
 
 const ms = new multistream.Listener()
 // or
@@ -112,39 +112,6 @@ const ms = new multistream.Dialer()
 ms.handle(conn, callback)
 ```
 
-### Handling a protocol
-
-This function is only available in Listener mode
-
-```JavaScript
-ms.addHandler(<protocol>, <handlerFunc>, [<matchingFunc>])
-```
-
-- `protocol` is a string identifying the protocol.
-- `handlerFunc` is a function of type `function (protocol, conn)` that will be called if there is a handshake performed on `protocol`.
-- `matchingFunc` is a function that receives a protocol and a callback and should call `callback(err, result)` where `err` is if there was a error on the matching function, and `result` is a boolean that represents if a match happened. The default `matchingFunc` is exact matching. The exact signature should be: `function (protocol, requestedProtocol, function (err, result)`
-
-### Selecting a protocol
-
-This function is only available in Dialer mode
-
-```JavaScript
-ms.select(<protocol>, <callback>)
-```
-
-- `protocol` is a string of the protocol that we want to handshake.
-- `callback` is a function of type `function (err, conn)` where `err` is an error object that gets passed if something wrong happend (e.g: if the protocol selected is not supported by the other end) and conn is the connection handshaked with the other end.
-
-### Listing the available protocols
-
-This function is only available in Dialer mode
-
-```JavaScript
-ms.ls(<callback>)
-```
-
-`callback` is a function of type `function (err, protocols)` where `err` is an error object that gets passed if something wrong happend and `protocols` is an array of the supported protocols in the other end.
-
 ### This module uses `pull-streams`
 
 We expose a streaming interface based on `pull-streams`, rather then on the Node.js core streams implementation (aka Node.js streams). `pull-streams` offers us a better mechanism for error handling and flow control guarantees. If you would like to know more about why we did this, see the discussion at this [issue](https://github.com/ipfs/js-ipfs/issues/362).
diff --git a/example.js b/example.js
new file mode 100644
index 0000000..e8415af
--- /dev/null
+++ b/example.js
@@ -0,0 +1,16 @@
+'use strict'
+
+const multistream = require('multistream-select')
+const Connection = require('interface-connection').Connection
+
+const listener = new multistream.Listener()
+// or
+// const dialer = new multistream.Dialer()
+
+// supply a connection
+const conn = new Connection()
+
+// apply the multistream to the conn
+listener.handle(conn, () => {
+  console.log('connection established')
+})
diff --git a/package.json b/package.json
index 11ced49..0debb48 100644
--- a/package.json
+++ b/package.json
@@ -7,9 +7,10 @@
     "lint": "aegir-lint",
     "test": "aegir-test",
     "build": "aegir-build",
-    "release": "aegir-release",
-    "release-minor": "aegir-release --type minor",
-    "release-major": "aegir-release --type major",
+    "docs": "aegir-docs",
+    "release": "aegir-release --docs",
+    "release-minor": "aegir-release --type minor --docs",
+    "release-major": "aegir-release --type major --docs",
     "test:node": "aegir-test node",
     "test:browser": "aegir-test browser",
     "coverage": "aegir-coverage",
@@ -40,8 +41,8 @@
   "author": "David Dias <daviddias@ipfs.io>",
   "license": "MIT",
   "dependencies": {
-    "async": "^2.1.2",
-    "debug": "^2.2.0",
+    "async": "^2.1.4",
+    "debug": "^2.4.1",
     "interface-connection": "^0.3.0",
     "lodash.isfunction": "^3.0.8",
     "lodash.range": "^3.2.0",
@@ -49,12 +50,12 @@
     "pull-length-prefixed": "^1.2.0",
     "pull-stream": "^3.5.0",
     "semver": "^5.3.0",
-    "varint": "^4.0.1"
+    "varint": "^5.0.0"
   },
   "devDependencies": {
-    "aegir": "^9.0.1",
+    "aegir": "^9.3.0",
     "chai": "^3.5.0",
-    "pre-commit": "^1.1.3",
+    "pre-commit": "^1.2.2",
     "pull-pair": "^1.1.0",
     "run-parallel": "^1.1.6",
     "run-series": "^1.1.4"
@@ -66,4 +67,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/dialer/index.js b/src/dialer/index.js
index bf08f36..5526fdd 100644
--- a/src/dialer/index.js
+++ b/src/dialer/index.js
@@ -9,13 +9,26 @@ const select = require('../select')
 
 const PROTOCOL_ID = require('./../constants').PROTOCOL_ID
 
-module.exports = class Dialer {
+/**
+ *
+ */
+class Dialer {
+  /**
+   * Create a new Dialer.
+   */
   constructor () {
     this.conn = null
     this.log = util.log.dialer()
   }
 
-  // perform the multistream handshake
+  /**
+   * Perform the multistream handshake.
+   *
+   * @param {Connection} rawConn - The connection on which
+   * to perform the handshake.
+   * @param {function(Error)} callback - Called when the handshake completed.
+   * @returns {undefined}
+   */
   handle (rawConn, callback) {
     this.log('dialer handle conn')
     const s = select(PROTOCOL_ID, (err, conn) => {
@@ -36,6 +49,18 @@ module.exports = class Dialer {
     )
   }
 
+  /**
+   * Select a protocol
+   *
+   * @param {string} protocol - A string of the protocol that we want to handshake.
+   * @param {function(Error, Connection)} callback - `err` is
+   * an error object that gets passed if something wrong happ
+   * end (e.g: if the protocol selected is not supported by
+   * the other end) and conn is the connection handshaked
+   * with the other end.
+   *
+   * @returns {undefined}
+   */
   select (protocol, callback) {
     this.log('dialer select ' + protocol)
     if (!this.conn) {
@@ -57,6 +82,16 @@ module.exports = class Dialer {
     )
   }
 
+  /**
+   * List all available protocols.
+   *
+   * @param {function(Error, Array<string>)} callback - If
+   * something wrong happend `Error` exists, otherwise
+   * `protocols` is a list of the supported
+   * protocols on the other end.
+   *
+   * @returns {undefined}
+   */
   ls (callback) {
     const lsStream = select('ls', (err, conn) => {
       if (err) {
@@ -103,3 +138,5 @@ function collectLs (conn) {
     return counter-- > 0
   })
 }
+
+module.exports = Dialer
diff --git a/src/index.js b/src/index.js
index 95db87c..e6e5ad7 100644
--- a/src/index.js
+++ b/src/index.js
@@ -3,3 +3,4 @@
 exports.Listener = exports.listener = require('./listener')
 exports.Dialer = exports.dialer = require('./dialer')
 exports.matchSemver = require('./listener/match-semver')
+exports.matchExact = require('./listener/match-exact')
diff --git a/src/listener/index.js b/src/listener/index.js
index f171fee..ade3b16 100644
--- a/src/listener/index.js
+++ b/src/listener/index.js
@@ -13,7 +13,13 @@ const Connection = require('interface-connection').Connection
 
 const PROTOCOL_ID = require('./../constants').PROTOCOL_ID
 
-module.exports = class Listener {
+/**
+ * Listener
+ */
+class Listener {
+  /**
+   * Create a new Listener.
+   */
   constructor () {
     this.handlers = {
       ls: {
@@ -25,7 +31,14 @@ module.exports = class Listener {
     this.log = util.log.listener()
   }
 
-  // perform the multistream handshake
+  /**
+   * Perform the multistream handshake.
+   *
+   * @param {Connection} rawConn - The connection on which
+   * to perform the handshake.
+   * @param {function(Error)} callback - Called when the handshake completed.
+   * @returns {undefined}
+   */
   handle (rawConn, callback) {
     this.log('listener handle conn')
 
@@ -54,7 +67,14 @@ module.exports = class Listener {
     )
   }
 
-  // be ready for a given `protocol`
+  /**
+   * Handle a given `protocol`.
+   *
+   * @param {string} protocol - A string identifying the protocol.
+   * @param {function(string, Connection)} handlerFunc - Will be called if there is a handshake performed on `protocol`.
+   * @param {matchHandler} [matchFunc=matchExact]
+   * @returns {undefined}
+   */
   addHandler (protocol, handlerFunc, matchFunc) {
     this.log('adding handler: ' + protocol)
     assert(isFunction(handlerFunc), 'handler must be a function')
@@ -72,4 +92,20 @@ module.exports = class Listener {
       matchFunc: matchFunc
     }
   }
+
+  /**
+   * Receives a protocol and a callback and should
+   * call `callback(err, result)` where `err` is if
+   * there was a error on the matching function, and
+   * `result` is a boolean that represents if a
+   * match happened.
+   *
+   * @callback matchHandler
+   * @param {string} myProtocol
+   * @param {string} senderProtocol
+   * @param {function(Error, boolean)} callback
+   * @returns {undefined}
+   */
 }
+
+module.exports = Listener
diff --git a/src/listener/match-exact.js b/src/listener/match-exact.js
index 6476672..87d3134 100644
--- a/src/listener/match-exact.js
+++ b/src/listener/match-exact.js
@@ -1,5 +1,14 @@
 'use strict'
 
+/**
+ * Match protocols exactly.
+ *
+ * @param {string} myProtocol
+ * @param {string} senderProtocol
+ * @param {function(Error, boolean)} callback
+ * @returns {undefined}
+ * @type {matchHandler}
+ */
 function matchExact (myProtocol, senderProtocol, callback) {
   const result = myProtocol === senderProtocol
   callback(null, result)
diff --git a/src/listener/match-semver.js b/src/listener/match-semver.js
index bda8578..8d45faf 100644
--- a/src/listener/match-semver.js
+++ b/src/listener/match-semver.js
@@ -2,6 +2,15 @@
 
 const semver = require('semver')
 
+/**
+ * Match protocols using semver `~` matching.
+ *
+ * @param {string} myProtocol
+ * @param {string} senderProtocol
+ * @param {function(Error, boolean)} callback
+ * @returns {undefined}
+ * @type {matchHandler}
+ */
 function matchSemver (myProtocol, senderProtocol, callback) {
   const mps = myProtocol.split('/')
   const sps = senderProtocol.split('/')