Structural Fix v.1
Merge pull request #1 from Flatscan/StructuralFixes

Structural Fix v.1