listener refactored
Merge pull request #1 from denuwanthi/master

listener refactored