Fixed config file
Merge commit '2e6830a0f6ce1a21337fea991e283377cfce9b8f'