Bundle up some changes
More timestamp goodness
Merge pull request #127 from zznate/autotimestampfix

Bundle up some changes