Gui merge with master