Merge pull request #3 from wesselvdv/develop

Pulling latest development changes into GUIRedesign