fixed add and remove eventlisteners

jira issue: WP-1085
Merge pull request #17 from krishnabangalore/WP-1085_addListener

fixed add and remove eventlisteners