resolved issue #376
Merge branch 'fix_handlers_working_with_parent_class'