Merge pull request #502 from rloomba/rloomba/add_unregister_listener