improve listeners support
release 1.0.6