Kmom4, liten fix
Merge branch 'dev'