Desktop gui update
Merge pull request #852 from solispauwels/master

Desktop gui update