Added support for timestamps
> merge