Added configuration application
Merge branch 'develop'