Timestamp type
Spaces fix
Merge pull request #1 from Ueasley/master

Timestamp type