Structure correction #8

Merged

11 Commits