#88 Choosing config depending the repository
Merge remote-tracking branch 'origin/feature-88' into feature-88