Fixed dodgy switch statement in matcher factory. Closes #53.