small mods
Merge branch 'task-16-configreader-refactor-to-config'