diff --git a/oarstats.py b/oarstats.py
index 0048d06a545591cc9167c795a270a08f91c2f7b2..6bdfb237a332acc1b290d6a7a3206e473e2c1a53 100755
--- a/oarstats.py
+++ b/oarstats.py
@@ -20,6 +20,7 @@ class Owner:
         self.running = defaultdict(int)
         self.resources = defaultdict(int)
         self.gpu = defaultdict(int)
+        self.devices = defaultdict(int)
 
     def add_job(self, job):
         self.queues[job.queue].append(job)
@@ -31,11 +32,15 @@ class Owner:
             self.running[job.queue] += 1
         if job.gpu:
             self.gpu[job.queue] += job.resources
+        for device in job.devices:
+            self.devices[device] += 1
 
-    def print_info(self):
+    def print_info(self, show_devices=False):
         print("User {} :: Total Time Reserved: {}".format(self.name, datetime.timedelta(seconds=self.timeleft)))
         for queue in self.queues.keys():
             print("\t{} - Running {}, Resources: {}, GPUs: {}, Karma: {}".format(queue, self.running[queue], self.resources[queue], self.gpu[queue], self.karma[queue]))
+        if show_devices and self.devices:
+            print("\t Running on: {}".format(" ".join(["{}:{}".format(device, amount) for device, amount in self.devices.items()])))
 
 
 class Job:
@@ -52,6 +57,7 @@ class Job:
 
 def argparser():
     parser = argparse.ArgumentParser()
+    parser.add_argument('--show-hosts', action="store_true")
     parser.add_argument('-l', '--logger', default='INFO',
                         choices=['DEBUG', 'INFO', 'WARNING', 'ERROR', 'CRITICAL'],
                         help="Logging level: DEBUG, INFO (default), WARNING, ERROR")