GUI update 01
Merge remote-tracking branch 'origin/GUI' into GUI