Fixed issue #72
Merge branch 'master' of github.com:buffer/thug
Merge remote-tracking branch 'upstream/master'