Timestamps
Merge pull request #95 from TheUnknownOne/design

Timestamps