Updated time message
merged with master