--- a/python/storage.py	Fri Jun 05 13:26:51 2015 +0200
+++ b/python/storage.py	Fri Jun 05 17:13:28 2015 +0200
@@ -372,7 +372,7 @@
         userTypes[row[0]] = row[1]
     return userTypes
 
-def loadTrajectoriesFromSqlite(filename, trajectoryType, objectNumbers = None):
+def loadTrajectoriesFromSqlite(filename, trajectoryType, objectNumbers = None, withFeatures = False):
     '''Loads the first objectNumbers objects or the indices in objectNumbers from the database'''
     connection = sqlite3.connect(filename)
 
@@ -411,6 +411,14 @@
             userTypes = loadUserTypesFromTable(cursor, trajectoryType, objectNumbers)
             for obj in objects:
                 obj.userType = userTypes[obj.getNum()]
+
+            if withFeatures:
+                nFeatures = 0
+                for obj in objects:
+                    nFeatures = max(nFeatures, max(obj.featureNumbers))
+                features = loadTrajectoriesFromSqlite(filename, 'feature', nFeatures)
+                for obj in objects:
+                    obj.setFeatures(features)
              
         except sqlite3.OperationalError as error:
             printDBError(error)
@@ -906,6 +914,7 @@
         self.nFramesIgnoreAtEnds = config.getint(self.sectionHeader, 'nframes-ignore-at-ends')
         self.speedAggregationQuantile = config.getint(self.sectionHeader, 'speed-aggregation-quantile')
         self.minSpeedEquiprobable = config.getfloat(self.sectionHeader, 'min-speed-equiprobable')
+        self.minNPixels = config.getint(self.sectionHeader, 'min-npixels-crop')
         self.pedBikeCarSVMFilename = config.get(self.sectionHeader, 'pbv-svm-filename')
         self.bikeCarSVMFilename = config.get(self.sectionHeader, 'bv-svm-filename')
         self.maxPedestrianSpeed = config.getfloat(self.sectionHeader, 'max-ped-speed')