renaming the timestamp in preparation of other timestamps that will be added later, adding tests
Merge pull request #8 from rouli/master

Improving timestamp feature