Merge pull request #18 from bofferdn/optional-settings-2

Optional settings 2