Changes to GUI class
Merge origin/master