GUI update
Merge remote-tracking branch 'upstream/master'
Merge pull request #158 from solispauwels/master

GUI update