Added a disable-on-match string, added disable message support