fix ä
Merge branch 'elvan' into develop