Dialog verbeterd
Merge mark into develop