Merge pull request #64 from stutonk/header_size_fix