Better timestamp

Closed Martin Bergemann requested to merge better_timestamp into init