fixed second gui bug
Merge branch 'jeroen'
xMerge branch 'peter'