LAC-9: save and load config from file. Bug fixing
Merging, fix conflict