avoid overriding settings
Merge pull request #21 from MasseGuillaume/play-2.2

avoid overriding settings