fixed bug timestamp bug
Merge pull request #326 from wraithan/fix_timestamps

fixed bug timestamp bug