Kleine verbetering torch
Merge branch 'Leon' into develop