Fix to work also for languages not being english
Merge branch 'swerter-master'