Added support for 2 receivers
Merge remote-tracking branch 'origin/master'