Weer wat verbeteringen
Merge branch 'master' of https://github.com/Alex-Oudsen/EPO-3