Compatibility with yelp-cheetah==0.6.0
Merge pull request #21 from bukzor/i_broke_it_again_wompwomp

Compatibility with yelp-cheetah==0.6.0