fixed that sounds killed the music
Merge branch 'henrik' into develop
as