Improved short-term fix for #53 - match on all hyphenated tokens