Index: bin/stamp
===================================================================
--- bin/stamp	(revision 71)
+++ bin/stamp	(revision 0)
@@ -3,5 +3,5 @@
 import sys
 from datetime import datetime
-from stamper.stamper import Stamper
+from stamper import DATE_FORMAT, Stamper
 
 
@@ -24,8 +24,7 @@
     if len(sys.argv) == 1:
         # stamp!
-        s.stamp(datetime.today().strftime(s.datetime_format),
-                None, None, None)
+        s.stamp(datetime.today().strftime(DATE_FORMAT), None, None, None)
 
-    elif len(sys.argv) >= 3:
+    elif len(sys.argv) == 3:
         # record!
         last_stamp = s.last_stamp()
@@ -33,8 +32,6 @@
         if not current_start:
             current_start = last_stamp['start']
-        customer = sys.argv[1]
-        description = ' '.join(sys.argv[2:])
-        s.stamp(current_start, datetime.today().strftime(s.datetime_format),
-                customer, description)
+        s.stamp(current_start, datetime.today().strftime(DATE_FORMAT),
+                sys.argv[1], sys.argv[2])
 
     else: