Merge pull request #422 from wolfmanjm/fix/module-event-arrays