Fixed concurrent modification of listeners array error
Merge branch 'master' into npm
Updated package