Revert "Merge timestamp branch to master"
Merge pull request #4 from dlanza1/revert-3-timestamp

Revert "Merge timestamp branch to master"