Update README.md
Delete TODO.md
Merge remote-tracking branch 'upstream/master'
Make chunking options configurabel: Made tests green again.