fixed bugs caused by introducing time into temp data
Merge remote-tracking branch 'origin/master'