Add with matcher. Closes #17.