more conf
Merge pull request #19 from cotal/master

more conf