Merge pull request #344 from jgrewe/master

improved stability of guess chunking

lgtm