config
Merge pull request #19 from Jonga/temp

config