Merged SimpleMarc.pm over from rel-1-2