Added simple setting
fixing repository compatibility to merge