change pretty printer to include attributes inside structs
Merge branch 'master' into JavaScript