gui update
Merge pull request #938 from solispauwels/master

gui update