Quick fix i deadlocks
Merge branch 'onlyh' of https://github.com/Sebelino/Team18v2 into onlyh