Fix 'or' scope to work on all classes
Merge pull request #27 from rdokov/master

Bugfix for 'or' scope