Merge pull request #1 from zenry/master

moved settings to separate file