bring FetchStruct in line
Merge pull request #30 from mrb/alter-fetchstruct

Bring FetchStruct in line