Fix timestamp handling
Update README