More comments added
Merge branch 'origin/feature/danny'
Merge wybren into develop
Merge danny into develop