Custom emit no longer required, as we're using the default eventemitter context
Merge branch 'master' of github.com:theangryangel/XI4N