Added config option to allow MACH detection.