Merge pull request #201 from mikeh/master

Compiled output header structure update