diff --git a/.check-author.yml b/.check-author.yml
index 327ea68..0a6863c 100644
--- a/.check-author.yml
+++ b/.check-author.yml
@@ -6,7 +6,10 @@ exclude:
   languages
 
 mapping:
-  Andreas Isaak <info@andreas-isaak.de>: Andreas Isaak <andy.jared@googlemail.com>
+  "Andreas Isaak <info@andreas-isaak.de>": "Andreas Isaak <andy.jared@googlemail.com>"
+  "Ingolf Steinhardt <info@e-spin.de>":
+    - "xantippe <info@e-spin.de>"
+    - "zonky2 <info@e-spin.de>"
 
 copy-left:
    "Stefan Heimes <stefan_heimes@hotmail.com>":
diff --git a/src/MetaModels/Attribute/Timestamp/Timestamp.php b/src/MetaModels/Attribute/Timestamp/Timestamp.php
index 7378215..0178b98 100644
--- a/src/MetaModels/Attribute/Timestamp/Timestamp.php
+++ b/src/MetaModels/Attribute/Timestamp/Timestamp.php
@@ -1,12 +1,15 @@
 <?php
 
 /**
- * The MetaModels extension allows the creation of multiple collections of custom items,
- * each with its own unique set of selectable attributes, with attribute extendability.
- * The Front-End modules allow you to build powerful listing and filtering of the
- * data in each collection.
+ * This file is part of MetaModels/attribute_timestamp.
+ *
+ * (c) 2012-2016 The MetaModels team.
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * This project is provided in good faith and hope to be usable by anyone.
  *
- * PHP version 5
  * @package    MetaModels
  * @subpackage AttributeTimestamp
  * @author     Christian Schiffler <c.schiffler@cyberspectrum.de>
@@ -15,8 +18,9 @@
  * @author     David Greminger <david.greminger@1up.io>
  * @author     David Maack <david.maack@arcor.de>
  * @author     David Molineus <david.molineus@netzmacht.de>
- * @copyright  The MetaModels team.
- * @license    LGPL.
+ * @author     Ingolf Steinhardt <info@e-spin.de>
+ * @copyright  2012-2016 The MetaModels team.
+ * @license    https://github.com/MetaModels/attribute_timestamp/blob/master/LICENSE LGPL-3.0
  * @filesource
  */
 
@@ -30,11 +34,6 @@
 
 /**
  * This is the MetaModelAttribute class for handling text fields.
- *
- * @package    MetaModels
- * @subpackage AttributeTimestamp
- * @author     Stefan Heimes <stefan_heimes@hotmail.com>
- * @author     Andreas Isaak <info@andreas-isaak.de>
  */
 class Timestamp extends Numeric
 {
@@ -51,10 +50,14 @@ public function getSQLDataType()
      */
     public function getFieldDefinition($arrOverrides = array())
     {
-        $strDateType                       = $this->getDateTimeType();
-        $arrFieldDef                       = parent::getFieldDefinition($arrOverrides);
-        $arrFieldDef['eval']['rgxp']       = $strDateType;
-        $arrFieldDef['eval']['datepicker'] = ($strDateType !== 'time');
+        $strDateType                 = $this->getDateTimeType();
+        $arrFieldDef                 = parent::getFieldDefinition($arrOverrides);
+        $arrFieldDef['eval']['rgxp'] = $strDateType;
+        
+        if (!empty($arrFieldDef['eval']['readonly'])) {
+            $arrFieldDef['eval']['datepicker'] = true;
+            $arrFieldDef['eval']['tl_class']  .= ' wizard';
+        }
 
         return $arrFieldDef;
     }