changed date format
merged with upstream