Merge pull request #52 from eileenmcnaughton/newSettingStuff