Merge pull request #577 from tfarina/structs

structs not classes.