wrt file changes with ref to Andreas pull request 1308

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

wrt file changes with ref to Andreas pull request 1308