Merge pull request #17 from Mrzy/setting

change:modify setting function