Feature/fixing configuration file