Fix documentation
Add listener support
Add listener support
Add listener support to the sample