reword and cleanup
header size
Merge branch 'master' into image-support