diff --git a/src/node/db/PadManager.js b/src/node/db/PadManager.js
index 32119038..82bc27d0 100644
--- a/src/node/db/PadManager.js
+++ b/src/node/db/PadManager.js
@@ -150,7 +150,11 @@ exports.getPad = function(id, text, callback)
 
 exports.getPads = function(callback)
 {
-  callback(null,padList.getPads());
+  if(callback != null){
+    callback(null,padList.getPads());
+  }else{
+    return padList.getPads();
+  }
 }
 
 //checks if a pad exists
diff --git a/src/package.json b/src/package.json
index 67acd126..826db97b 100644
--- a/src/package.json
+++ b/src/package.json
@@ -46,5 +46,5 @@
   "engines"        : { "node" : ">=0.6.0",
                        "npm"  : ">=1.0"
                      }, 
-  "version"        : "1.2.3"
+  "version"        : "1.2.4"
 }