Merge branch 'master' of https://github.com/buffer/thug
Merge branch 'master' of https://github.com/thesteed/thug