Upgraded GUI
Merge origin/master