config
Merge pull request #36 from HappyDevs/dev-dan

config