Merge remote-tracking branch 'origin/blaadje-2.0'
Paar comments en codefixes.
Merge remote-tracking branch 'origin/master' into blaadje-2.0