Merge pull request #441 from mhaskel/use_setting