Kleine veranderen + cleanup
Merge branch 'master' of https://github.com/PvdLugt/mustached-bear.git