Finished event listener (probably)
Merge pull request #1 from SrsBusiness/client

Finished event listener (probably)