added event listener
Merge origin/master