Merge pull request #85 from segmentio/dev

2.0.4
Merge branch 'dev'
Merge branch 'dev'
prepare for next development iteration