merge the branch 'gui'