Fix error in cofiguration
Merge branch 'development'