diff --git a/lib/m2node.js b/lib/m2node.js
index 586ce71..f223466 100644
--- a/lib/m2node.js
+++ b/lib/m2node.js
@@ -6,7 +6,7 @@
   exports.run = function(server, options) {
     var handler;
     handler = new Handler(options);
-    return handler.on('request', function(request) {
+    handler.on('request', function(request) {
       var fakeSocket;
       fakeSocket = new FakeSocket();
       fakeSocket.on('write', function() {
@@ -15,5 +15,6 @@
       server.emit('connection', fakeSocket);
       return fakeSocket.emitData(request.toFullHttpRequest());
     });
+    return handler;
   };
 }).call(this);
diff --git a/package.json b/package.json
index 2a03ab4..1cccf67 100644
--- a/package.json
+++ b/package.json
@@ -5,6 +5,8 @@
   "keywords"            : ["http", "mongrel2"],
   "homepage"            : "https://github.com/dan-manges/m2node",
   "author"              : "Dan Manges <dan.manges@gmail.com> (http://www.dan-manges.com)",
+  "contributors" :
+    [ "Paul Bergeron <paul.d.bergeron@gmail.com>" ],
   "main"                : "./lib/m2node.js",
   "repository"          : { "type": "git", "url" : "https://github.com/dan-manges/m2node.git" },
   "engines"             : { "node": "~0.4.8" },
diff --git a/src/m2node.coffee b/src/m2node.coffee
index f85a8dc..60cd193 100644
--- a/src/m2node.coffee
+++ b/src/m2node.coffee
@@ -11,4 +11,5 @@ exports.run = (server, options) ->
       handler.sendResponse(request, fakeSocket.writeBuffer)
     server.emit 'connection', fakeSocket
     fakeSocket.emitData(request.toFullHttpRequest())
+  handler