Merge pull request #3 from dguest/master

merge in trigger matching and control regions
Merge remote branch 'common/master'