import our patches

- strict regex to distict different packages
- always use onstatus
Merge pull request #324 from reallyenglish/10_1_tomoyukis

import our patches