Re-work fix for #36, adding stopImmediatePropagation - fixes #36
Merge branch 'issue/#36-rework'