added handling of non-default settings
Merge pull request #10 from wick-ed/master

added handling of non-default settings