GUI update
Merge pull request #4 from solispauwels/master

GUI update