added documentation for 'and' and 'or'