Added OR-based search functionality.
Fixed merge of 'or-based-search' into 'all-the-branches'.