Matchers for generic commands

Implementation of #60 .