Merge branch 'release/0.0.2'
Merge tag 'v0.0.2' into develop

Update dispatcher to handle listeners correctly