Some conf
Merge pull request #1 from djorak/config

Some conf