Small update with listeners/talkers
Merge branch