Merge pull request #266 from joncham/bug-struct-pack-size