Merge pull request #150 from goranche/master

Show events that are happening now, show end time for current events