Working GUI
Merge remote-tracking branch 'origin/1.5' into 1.5