1 files changed, 19 insertions, 12 deletions

diff --git a/kronos/storage.py b/kronos/storage.py
index 4add988..2cb37a7 100644
--- a/kronos/storage.py
+++ b/kronos/storage.py
@@ -41,16 +41,20 @@ class BaseStorageBackEnd(object):
         back-end.
         """
         name = model_obj.__name__
-        result = self.select(name, **kwargs)
 
-        instance = model_obj()
-        for key, value in result.items():
-            if key != 'id':
-                setattr(instance, key, value)
-            else:
-                instance.__db_id__ = value
+        output = []
+        for item in self.select(name, **kwargs):
+            instance = model_obj()
+
+            for key, value in item.items():
+                if key != 'id':
+                    setattr(instance, key, value)
+                else:
+                    instance.__db_id__ = value
 
-        return instance
+            output.append(instance)
+
+        return output
 
     def save(self, model_obj):
         """
@@ -121,11 +125,14 @@ class SQLiteBackEnd(BaseStorageBackEnd):
         self.connection = self.engine.connect(database)
 
     def select(self, table, **kwargs):
-        sql = "SELECT * FROM {0} WHERE ".format(table)
-        for key in kwargs.keys():
-            sql += "{0}=? ".format(key)
+        sql = "SELECT * FROM {0}".format(table)
+
+        if kwargs:
+            sql += " WHERE "
+            for key in kwargs.keys():
+                sql += "{0}=? ".format(key)
 
-        return self._get_normalized_results(sql, **kwargs)[0]
+        return self._get_normalized_results(sql, **kwargs)
 
     def _get_normalized_results(self, sql, **kwargs):
         self._check_connection()