Adds initial setting support for Issue #6