Merge pull request #454 from justinweiss/handle-oob-cd-reads