Added process matcher
Merge part of remote-tracking branch 'pr/8/head'