Implemented receiver
Merge origin/master