Separated event mapping functionality into a separate function (map_event_range)
Merge remote-tracking branch 'origin/master'