Annex60 pull into issue34_StructureError issue branch