Merge branch 'master'
Stacks generic gemaakt
Merge branch 'reinier'