Successful merge of master and GUI