able to test templates; able to use regexps in matchers
Merge remote-tracking branch 'origin/master'