log and show timestamp
Merge remote-tracking branch 'upstream/master'
Merge pull request #2 from ThorstenHi/master

log and show timestamp