Refactor config
Merge pull request #2 from dashboard-services/master

Refactor config