Merge pull request #2 from denizzzka/add_config

many changes, need merge to main
Merge branch 'add_config'
Merge branches 'add_config' and 'master' into add_config