Move feature detection to highest scope in module. Event variable rename.
Merge pull request #154 from mariomc/event-changes

Move feature detection to highest scope in module. Event variable rename...