remove EventListener
Merge branch 'issue-17' into develop