Merge pull request #57 from jedws/encoding-concurrency

Encoding concurrency
Merge remote-tracking branch 'upstream/encoding-concurrency'