Yelp base v2

Want to merge master with Yelp base version 2. Should follow quality policy.