configue settings!!
Merge pull request #1 from dixdix/master

configue settings!!