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