GUI kaartehans
Merged master changes