added configuration
Merge branch 'rp-settings'