diff --git a/example/app.js b/example/app.js
index f26f22d..f57e04e 100644
--- a/example/app.js
+++ b/example/app.js
@@ -1,4 +1,4 @@
-var storage = require('../lib/index');
+var storage = require('../lib/factory');
 var path = require('path');
 
 var rs = storage.createClient({
diff --git a/example/upload.js b/example/upload.js
index dd92ed8..1ce0a30 100644
--- a/example/upload.js
+++ b/example/upload.js
@@ -4,7 +4,7 @@ var express = require('express');
 var app = express();
 
 app.configure(function () {
-    app.set('port', process.env.PORT || 3000);
+    app.set('port', process.env.PORT || 3001);
     app.set('views', __dirname + '/views');
     app.set('view engine', 'ejs');
     app.use(express.favicon());
diff --git a/lib/index.js b/lib/factory.js
similarity index 100%
rename from lib/index.js
rename to lib/factory.js
diff --git a/lib/storage-handler.js b/lib/storage-handler.js
index 1a884c4..07b6dbe 100644
--- a/lib/storage-handler.js
+++ b/lib/storage-handler.js
@@ -1,16 +1,25 @@
-var factory = require('./index');
+var factory = require('./factory');
 
 var IncomingForm = require('formidable');
 var StringDecoder = require('string_decoder').StringDecoder;
 
 module.exports = Uploader;
 
+/**
+ * Constructor
+ * @param options The client instance or options to create a client
+ * @returns {Uploader}
+ * @constructor
+ */
 function Uploader(options) {
     if (!(this instanceof Uploader)) {
         return new Uploader(options);
     }
-    this.client = factory.createClient(options);
-    this.options = options;
+    if('function' === typeof options) {
+        this.client = options;
+    } else {
+        this.client = factory.createClient(options);
+    }
 }
 
 Uploader.prototype.processUpload = function (req, res, cb) {