Fix language switching
Merge pull request #42 from nephila/feature/language_switching

Fix language switching