manually merged gui into master
Merge branch 'origin/master'