Merge branch 'feat/add-config'