GUIview update
Merge origin/master