Listener complete
Merge remote-tracking branch 'BeaconListener/master'