conf
Merge pull request #2 from pisi79/sample

conf