Merge pull request #3 from wesselvdv/develop

Develop
Merge pull request #7 from wesselvdv/feature/GUIRedesign

Merge pull request #3 from wesselvdv/develop