Updating account listeners
Merge pull request #64 from cmfcmf/event-patch

[WIP] Updating account listeners, refs #57