Fix bug in entity and add event output for date>now()
Merge remote-tracking branch 'origin/master'