Fixed chunking issues
Merge branch 'master' into chunk-fix
Merge pull request #2 from renedx/chunk-fix

Chunk fix