working on the next feature
config files updated
Merge branch 'development'