diff --git a/middleware/koa/index.js b/middleware/koa/index.js
new file mode 100644
index 00000000..f7f2f5b1
--- /dev/null
+++ b/middleware/koa/index.js
@@ -0,0 +1 @@
+exports.serveStatic = require('./serveStatic');
\ No newline at end of file
diff --git a/middleware/koa/serveStatic.js b/middleware/koa/serveStatic.js
index 4c146246..93754ca8 100644
--- a/middleware/koa/serveStatic.js
+++ b/middleware/koa/serveStatic.js
@@ -1,7 +1,7 @@
 require('raptor-polyfill/string/startsWith');
 require('raptor-polyfill/string/endsWith');
 
-var lasso = require('../');
+var lasso = require('../../');
 var send = require('send');
 var extend = require('raptor-util/extend');
 
@@ -9,7 +9,7 @@ function notFound() {
     this.error(404);
 }
 
-module.exports = function(options) {
+module.exports = function (options) {
     options = options || {};
 
     var myLasso = options.lasso || lasso.getDefaultLasso();
@@ -23,7 +23,7 @@ module.exports = function(options) {
     }
 
     if (!outputDir || !urlPrefix) {
-        return function(req, res, next) {
+        return function (req, res, next) {
             return next();
         };
     }
@@ -40,31 +40,34 @@ module.exports = function(options) {
 
     sendOptions.root = outputDir;
 
+    return function* (next) {
 
-    return function(ctx, next) {
-        var req = ctx.request,
-            res = ctx.response;
+        var ctx = this;
 
-        var path = req.path;
-        if (!path.startsWith(routePrefix) || (req.method !== 'GET' && req.method !== 'HEAD')) {
-            return next();
+        var path = ctx.request.path;
+        if (!path.startsWith(routePrefix) || (ctx.request.method !== 'GET' && ctx.request.method !== 'HEAD')) {
+            return yield next;
         }
 
-        var filePath = path.substring(routePrefix.length);
-
-        // create send stream
-        var stream = send(req, filePath, sendOptions);
+        ctx.respond = false;
 
-        // add directory handler
-        stream.on('directory', notFound);
+        var filePath = path.substring(routePrefix.length);
 
-        // forward errors
-        stream.on('error', function error(err) {
-            res.statusCode = err.statusCode || 500;
-            res.end('Not found: ' + filePath);
+        yield new Promise(function (resolve, reject) {
+            send(ctx.req, filePath, sendOptions)
+                .on('error', function(err) {
+                    ctx.res.statusCode = err.statusCode || 500;
+                    ctx.res.end('Not found: ' + filePath);
+                    reject(err);
+                })
+                .on('directory', notFound)
+                .on('headers', function(req, path, stat) {
+                    ctx.status = 200;
+                })
+                .on('end', function() {
+                    resolve();
+                })
+                .pipe(ctx.res);
         });
-
-        // pipe
-        stream.pipe(res);
     };
 };
diff --git a/package.json b/package.json
index e3d7b079..d740b244 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,9 @@
   },
   "author": "Patrick Steele-Idem <pnidem@gmail.com>",
   "maintainers": "Patrick Steele-Idem <pnidem@gmail.com>",
+  "contributors": [
+    "Karl Morrison <karl@basickarl.io>"  
+  ],
   "dependencies": {
     "app-module-path": "^1.0.0",
     "app-root-dir": "^1.0.0",
@@ -68,5 +71,5 @@
     "concat",
     "minify"
   ],
-  "version": "2.6.0"
+  "version": "2.6.1"
 }