Fix Timestamp class
Merge pull request #12 from sestegra/timestamp

Fix Timestamp class