Merge pull request #27 from fun-ruby/group-with-next-event

Group with next event