merging SMRomeo-master2