Make timestamp own its state
Merge pull request #8 from mbautin/shark-0.9-csd-timestamp-internal-state-fix-from-scratch

Make timestamp own its state