Merge branch 'development'
refactoring done
H1, achtergrond, af!