Refactor logic
Merge branch 'develop' of github.com:Q42/q42.nl into develop