Config improvs
Merge pull request #2 from anr-ru/alex-dev

Config improvs