gui updated
Merge branch 'gui' into merge
merge