Fixing parsing of structs
Merge branch 'strutz' into bleeding-edge