New version of catstruct.m