Fix issue 87 - added support for dynamic event names also