GUI update
Merge pull request #244 from solispauwels/GUI

GUI update