modified example configuration
Merge branch 'develop'