Merged current version of GUI into master