Better log timestamp
Merge pull request #365 from vuolter/m/timestamp

Better timestamp