Merge "Issue34 bug in structure" branch in "issue34_BESTEST"