Fine adjustments, roles set in config object
Merge remote-tracking branch 'origin/development'