Remove timestamp, fix time
Merge pull request #11 from csheldonhess/master

Remove timestamp, fix time