Working on config
Added development branch
Merge branch 'add-config' into development