did a little more with the gui
Merge remote-tracking branch 'origin/master'
We have some problems