fixing issue #611
Merge pull request #612 from Invis1ble/inline-custom-messages-4-custom-rules-patch

fixing issue #611
Merge branch 'master' into unbind_correct_handler