Merge pull request #36 from dyoachim/editing_timestamps

Editing timestamps