Fix scene 2
Merge branch 'gui' into dev
Loop