Fixes StructureNode issues
Merge pull request #143 from kimausloos/master

Fixes StructureNode issues