Added 'or' parameter and renamed 'matching' to 'and' in documentation