Merge branch 'feature/Lars' into develop
Very small fixes
Counts hits and misses
Merge branch 'develop' into feature/Lars