diff --git a/README.md b/README.md
index 4d7a1974..44bedb96 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ LoopBack DataSource Juggler consists of the following components:
 * DataSource
 * Connector
 
-![loopback-datasource-juggler-overview](overview.png "LoopBack Diagram")
+![loopback-datasource-juggler-overview](docs/overview.png "LoopBack Diagram")
 
 ## LoopBack Definition Language
 
diff --git a/docs.json b/docs.json
index 1830717e..01a9ed58 100644
--- a/docs.json
+++ b/docs.json
@@ -39,6 +39,10 @@
         "docs/definition-language.md",
         "docs/datasource-connector.md"
     ],
-    "codeSectionDepth": 4
+    "codeSectionDepth": 4,
+    "assets": {
+      "/": "/docs",
+      "/docs": "/docs"
+    }
 }
 
diff --git a/overview.png b/docs/overview.png
similarity index 100%
rename from overview.png
rename to docs/overview.png
diff --git a/lib/datasource.js b/lib/datasource.js
index 2d7215fb..027eb866 100644
--- a/lib/datasource.js
+++ b/lib/datasource.js
@@ -220,7 +220,7 @@ DataSource.prototype.setup = function(name, settings) {
     }
 
     if (connector) {
-        var postInit = function postInit() {
+        var postInit = function postInit(err, result) {
 
             this._setupConnector();
             // we have an connector now?
@@ -228,8 +228,10 @@ DataSource.prototype.setup = function(name, settings) {
                 throw new Error('Connector is not defined correctly: it should create `connector` member of dataSource');
             }
 
-            this.connected = true;
-            this.emit('connected');
+            this.connected = !err; // Connected now
+            if(this.connected) {
+                this.emit('connected');
+            }
 
         }.bind(this);
 
diff --git a/package.json b/package.json
index d9465a7d..81c3b74b 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,8 @@
 {
   "name": "loopback-datasource-juggler",
-  "description": "ORM for every database: redis, mysql, neo4j, mongodb, couchdb, postgres, sqlite",
   "version": "1.0.0",
+  "description": "LoopBack DataSoure Juggler",
+  "keywords": [ "StrongLoop", "LoopBack", "DataSource", "Juggler", "ORM" ],
   "repository": {
     "type": "git",
     "url": "https://github.com/strongloop/loopback-datasource-juggler"
@@ -20,7 +21,7 @@
   "devDependencies": {
     "blanket": "~1.1.5",
     "should": "~1.2.2",
-    "mocha": "~1.8.2"
+    "mocha": "~1.12.1"
   },
   "dependencies": {
     "async": "~0.2.9",
@@ -28,4 +29,4 @@
     "traverse": "~0.6.5"
   },
   "license": "MIT"
-}
\ No newline at end of file
+}