Merge pull request #233 from svost/defaultcodec