added date and time format
merged changes from master
adjusted merge