GUI modified
Merge origin/master