Issue 29 chunking options

Moved pull request into own branch