Implemented Event Listener
Merge origin/master