more magic with typedefs and structs
Merge remote-tracking branch 'origin/master'