change pretty printer to include attributes inside structs
Merge remote-tracking branch 'upstream/master'