Index: bin/stamps
===================================================================
--- bin/stamps	(revision 38)
+++ bin/stamps	(revision 40)
@@ -39,5 +39,5 @@
     # Call the proper methods, based on the given parameters
     if args.timeline:
-        s.timeline(args.filter)
+        s.timeline(args.customer, args.filter)
     elif args.delete:
         s.remove_stamps(args.delete)
Index: stamper/stamper.py
===================================================================
--- stamper/stamper.py	(revision 39)
+++ stamper/stamper.py	(revision 40)
@@ -237,8 +237,7 @@
         return details, totals, total_customer
 
-    def timeline(self, stamp_filter=None):
+    def timeline(self, customer=None, stamp_filter=None):
         filter_from, filter_to = self.validate_filter(stamp_filter)
         for stamp in self.stamps:
-            customer = stamp['customer']
             start = datetime.strptime(stamp['start'], DATETIME_FORMAT)
             start_day = start.strftime('%Y-%m-%d')
@@ -251,7 +250,13 @@
                 # similar for the end date
                 continue
+
             if not stamp['customer']:
-                print(stamp['start'] + ' start')
+                if customer is None:
+                    print(stamp['start'] + ' start')
             else:
+                if customer and customer != stamp['customer']:
+                    continue
+                if customer:
+                    print(stamp['start'] + ' start')
                 print(' '.join([stamp['end'],
                                 stamp['customer'],