Edit listener and manager
Merge branch 'release/1.0.1'