diff --git a/bob/bio/base/tools/algorithm.py b/bob/bio/base/tools/algorithm.py
index a819c06f11e9ea5ace4d2d7e555f13e77031b434..6fdaf318a5b62cd0a6bcf18ca671725d0bfa20a8 100644
--- a/bob/bio/base/tools/algorithm.py
+++ b/bob/bio/base/tools/algorithm.py
@@ -165,7 +165,7 @@ def train_enroller(algorithm, extractor, force = False):
     train_features = read_features(train_files, reader, True)
 
     # perform training
-    logger.info("- Enrollment: training enroller '%s' using %d identities: ", fs.enroller_file, len(train_features))
+    logger.info("- Enrollment: training enroller '%s' using %d identities", fs.enroller_file, len(train_features))
     algorithm.train_enroller(train_features, fs.enroller_file)
 
 
diff --git a/bob/bio/base/tools/command_line.py b/bob/bio/base/tools/command_line.py
index 6764792663af1ce5fa3b24e4e87b978773f95f09..1f817ef22552d78aed07628c28cb9207e347b9c1 100644
--- a/bob/bio/base/tools/command_line.py
+++ b/bob/bio/base/tools/command_line.py
@@ -131,6 +131,8 @@ def command_line_parser(description=__doc__, exclude_resources_from=[]):
       help = 'Performs score calibration after the scores are computed.')
   flag_group.add_argument('-z', '--zt-norm', action='store_true',
       help = 'Enable the computation of ZT norms')
+  flag_group.add_argument('-r', '--parallel', type=int,
+      help = 'This flag is a shortcut for running the commands on the local machine with the given amount of parallel threads; equivalent to --grid bob.bio.base.grid.Grid("local", number_of_parallel_threads=X) --run-local-scheduler --stop-on-failure.')
 
   return {
     'main' : parser,
@@ -191,6 +193,11 @@ def initialize(parsers, command_line_parameters = None, skips = []):
       if skip not in args.execute_only:
         exec("args.skip_%s = True" % (skip.replace("-", "_")))
 
+  if args.parallel is not None:
+    args.grid = ['bob.bio.base.grid.Grid("local", number_of_parallel_processes = %d)' % args.parallel]
+    args.run_local_scheduler = True
+    args.stop_on_failure = True
+
   # logging
   bob.core.log.set_verbosity_level(logger, args.verbose)