Merge pull request #212 from tromey/struct-layout