Added timestamps and more time measurements
Merge remote-tracking branch 'origin/master'