added proper timestamps, fixes #3