Fixed Accept-Language typo
fixed merge conflict
Integrated feedback from Norbert Lindenberg