Refactor settings
Merge pull request #48 from nephila/feature/refactor_settings

Refactor settings