CR changes to PR13
Merge pull request #15 from Yelp/ChangesToPR13

CR changes to PR13