Fix voor #93, #94, #96
Merge remote-tracking branch 'origin/release/1.0.9_(beta)' into release/1.0.9_(beta)