Issue #330 - Settings added