added fork from SettingsPlus@lusito.info