modified message push event. fixed #10
conflict resolved