refactor receiver, decorator module
Merge pull request #422 from leonindy/master

refactor receiver, decorator module