Revert "Removed config file"

This reverts commit a75f0ce93961b79e68f45e9d6bf1997b11830642.
Merge branch 'develop'