updated config
Merge branch 'development' into build