Merge branch 'release/4.2.5'
Add component support
Merge branch 'component' of https://github.com/RobLoach/EventEmitter into RobLoach-component
Tweaked component addition formatting.