merge some old changes

that were not ported back to this repo
Merge pull request #6 from DataDog/tristan/merge-back-old-changes

merge some old changes