More timestamp work
Merge pull request #271 from LearningLocker/develop

More timestamp work