added date and time
Merge branch 'TestBrunch'