config
Merge pull request #10 from labanyd/master

config