fixed #197
fixed #198
Merge pull request #199 from DataDog/update_aug_6

Update aug 6