Refactoring the settings module
Merge pull request #38 from jespino/refactor-settings-module

Refactoring the settings module