Fix canonicalisation of matchers (see new tests)
Merge pull request #13 from TabDigital/canonical

Fix canonicalisation of matchers (see new tests)