Unified2xff v6

New version addressing the comments and fixing a bug due to the constants selected for the XFF operation mode.