adding proper event scoping (w/ test)
Merge branch 'v1.0' into gh-pages