EDIT voor Fabian
Merge pull request #47 from flubbes/Design

merge Design into update-1