#381 - listen to events on demand

Changes of @spicyj are now in.

Apologies for the overload of commits, had some git issues :-).